diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-15 04:56:02 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-15 04:56:02 +0100 |
commit | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (patch) | |
tree | 980297c1747ca89354bc879cc5d17903eacb19e2 /include/asm-x86_64/page.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
parent | [PATCH] x86_64: Fix sparse mem (diff) | |
download | linux-4060994c3e337b40e0f6fa8ce2cc178e021baf3d.tar.xz linux-4060994c3e337b40e0f6fa8ce2cc178e021baf3d.zip |
Merge x86-64 update from Andi
Diffstat (limited to 'include/asm-x86_64/page.h')
-rw-r--r-- | include/asm-x86_64/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h index e5ab4d231f2c..06e489f32472 100644 --- a/include/asm-x86_64/page.h +++ b/include/asm-x86_64/page.h @@ -11,7 +11,7 @@ #define PAGE_SIZE (1UL << PAGE_SHIFT) #endif #define PAGE_MASK (~(PAGE_SIZE-1)) -#define PHYSICAL_PAGE_MASK (~(PAGE_SIZE-1) & (__PHYSICAL_MASK << PAGE_SHIFT)) +#define PHYSICAL_PAGE_MASK (~(PAGE_SIZE-1) & __PHYSICAL_MASK) #define THREAD_ORDER 1 #ifdef __ASSEMBLY__ |