diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-07-22 01:59:56 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 04:43:45 -0400 |
commit | 77be1fabd024b37423d12f832b1fbdb95dbdf494 (patch) | |
tree | b1fa99ff9b1c0bcb63c7a602a425d72b24c1ede6 /arch/x86/xen/mmu.c | |
parent | 59438c9fc4f7a92c808c9049bc6b396f98bf954c (diff) |
x86: add PTE_FLAGS_MASK
PTE_PFN_MASK was getting lonely, so I made it a friend.
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen/mmu.c')
-rw-r--r-- | arch/x86/xen/mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 0db6912395ed..aa37469da696 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -344,7 +344,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val) | |||
344 | { | 344 | { |
345 | if (val & _PAGE_PRESENT) { | 345 | if (val & _PAGE_PRESENT) { |
346 | unsigned long mfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT; | 346 | unsigned long mfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT; |
347 | pteval_t flags = val & ~PTE_PFN_MASK; | 347 | pteval_t flags = val & PTE_FLAGS_MASK; |
348 | val = ((pteval_t)mfn_to_pfn(mfn) << PAGE_SHIFT) | flags; | 348 | val = ((pteval_t)mfn_to_pfn(mfn) << PAGE_SHIFT) | flags; |
349 | } | 349 | } |
350 | 350 | ||
@@ -355,7 +355,7 @@ static pteval_t pte_pfn_to_mfn(pteval_t val) | |||
355 | { | 355 | { |
356 | if (val & _PAGE_PRESENT) { | 356 | if (val & _PAGE_PRESENT) { |
357 | unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT; | 357 | unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT; |
358 | pteval_t flags = val & ~PTE_PFN_MASK; | 358 | pteval_t flags = val & PTE_FLAGS_MASK; |
359 | val = ((pteval_t)pfn_to_mfn(pfn) << PAGE_SHIFT) | flags; | 359 | val = ((pteval_t)pfn_to_mfn(pfn) << PAGE_SHIFT) | flags; |
360 | } | 360 | } |
361 | 361 | ||