path: root/arch/x86/kernel/head_32.S
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-12 12:55:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-12 12:55:32 -0700
commitcbfa66b88d5720b81b75e72e7de8116d338e6b30 (patch)
tree43ac35f5cfce4d2090bfbf429558ed1bafa2c51a /arch/x86/kernel/head_32.S
parent1b3cba8e60c67c968d108ac55c77e32c1928dec3 (diff)
parentf8a45704f5bd5f037c8e4a75172cab1476fc0447 (diff)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest x86, lockdep: fix "WARNING: at kernel/lockdep.c:2658 check_flags+0x4c/0x128()" x86: fix an incompatible pointer type warning on 64-bit compilations x86: fix lockdep warning during suspend-to-ram x86: fix unused variable 'loops' warning in arch/x86/boot/a20.c Revert "x86: fix ioapic bug again" x86: fix asm warning in head_32.S x86: fix endless page faults in mount_block_root for Linux 2.6 geode: fix modular build
Diffstat (limited to 'arch/x86/kernel/head_32.S')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index b2cc73768a9d..f7357cc0162c 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -189,7 +189,7 @@ default_entry:
* this stage.
-#define KPMDS ((0x100000000-__PAGE_OFFSET) >> 30) /* Number of kernel PMDs */
+#define KPMDS (((-__PAGE_OFFSET) >> 30) & 3) /* Number of kernel PMDs */
xorl %ebx,%ebx /* %ebx is kept at zero */