diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-05-20 08:26:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 07:51:20 -0700 |
| commit | c57c05d0032cd5a500c5eba18ede4867a6d2cd5f (patch) | |
| tree | 11bf6ced8942ad61a79bce4c025bc07635b32d7c | |
| parent | 1bb271db63c356212564aad050b2cf026f800858 (diff) | |
| download | linux-3.10-c57c05d0032cd5a500c5eba18ede4867a6d2cd5f.tar.gz linux-3.10-c57c05d0032cd5a500c5eba18ede4867a6d2cd5f.tar.bz2 linux-3.10-c57c05d0032cd5a500c5eba18ede4867a6d2cd5f.zip | |
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 223146da2fa..dc936dddf16 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h @@ -10,6 +10,9 @@ #ifdef __KERNEL__ +#define __PHYSICAL_MASK ((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1) +#define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1) + /* Cast PAGE_MASK to a signed type so that it is sign-extended if virtual addresses are 32-bits but physical addresses are larger (ie, 32-bit PAE). */ @@ -29,9 +32,6 @@ /* to align the pointer to the (next) page boundary */ #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) -#define __PHYSICAL_MASK ((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1) -#define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1) - #ifndef __ASSEMBLY__ #include <linux/types.h> #endif |