diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-05-20 03:26:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 10:51:20 -0400 |
commit | c57c05d0032cd5a500c5eba18ede4867a6d2cd5f (patch) | |
tree | 11bf6ced8942ad61a79bce4c025bc07635b32d7c | |
parent | 1bb271db63c356212564aad050b2cf026f800858 (diff) |
x86: rearrange __(VIRTUAL|PHYSICAL)_MASK
Put the definitions of __(VIRTUAL|PHYSICAL)_MASK before their uses.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tested-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/asm-x86/page.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index 223146da2faf..dc936dddf161 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h | |||
@@ -10,6 +10,9 @@ | |||
10 | 10 | ||
11 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
12 | 12 | ||
13 | #define __PHYSICAL_MASK ((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1) | ||
14 | #define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1) | ||
15 | |||
13 | /* Cast PAGE_MASK to a signed type so that it is sign-extended if | 16 | /* Cast PAGE_MASK to a signed type so that it is sign-extended if |
14 | virtual addresses are 32-bits but physical addresses are larger | 17 | virtual addresses are 32-bits but physical addresses are larger |
15 | (ie, 32-bit PAE). */ | 18 | (ie, 32-bit PAE). */ |
@@ -29,9 +32,6 @@ | |||
29 | /* to align the pointer to the (next) page boundary */ | 32 | /* to align the pointer to the (next) page boundary */ |
30 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | 33 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) |
31 | 34 | ||
32 | #define __PHYSICAL_MASK ((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1) | ||
33 | #define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1) | ||
34 | |||
35 | #ifndef __ASSEMBLY__ | 35 | #ifndef __ASSEMBLY__ |
36 | #include <linux/types.h> | 36 | #include <linux/types.h> |
37 | #endif | 37 | #endif |