Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x86,mm: return actual type from get_{pte,pde,pdpe}() #239

Merged
merged 1 commit into from
Jan 18, 2022
Merged

x86,mm: return actual type from get_{pte,pde,pdpe}() #239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions include/arch/x86/pagetable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,28 +240,28 @@ static inline pte_t *get_l1_table(const void *va) {
/* Return the virtual address of the PT entry mapping this virtual address.
* The entry is assumed to be mapped
*/
static inline pgentry_t *get_pte(const void *va) {
static inline pte_t *get_pte(const void *va) {
pte_t *l1t = get_l1_table(va);
pte_t *l1e = l1_table_entry(l1t, va);
return &(l1e->entry);
return (pte_t *) &(l1e->entry);
}

/* Return the virtual address of the PD entry mapping this virtual address.
* The entry is assumed to be mapped
*/
static inline pgentry_t *get_pde(const void *va) {
static inline pde_t *get_pde(const void *va) {
pde_t *l2t = get_l2_table(va);
pde_t *l2e = l2_table_entry(l2t, va);
return &(l2e->entry);
return (pde_t *) &(l2e->entry);
}

/* Return the virtual address of the PDP entry mapping this virtual address.
* The entry is assumed to be mapped
*/
static inline pgentry_t *get_pdpe(const void *va) {
static inline pdpe_t *get_pdpe(const void *va) {
pdpe_t *l3t = get_l3_table(va);
pdpe_t *l3e = l3_table_entry(l3t, va);
return &(l3e->entry);
return (pdpe_t *) &(l3e->entry);
}

static inline void set_pgentry(pgentry_t *e, mfn_t mfn, unsigned long flags) {
Expand Down