aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/boot.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 08:40:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 08:40:21 -0700
commitb7723f9d21d8d6043e63f5e3e412f321f5f1900c (patch)
tree984098e5c060600e90e62f1b101593805f7cb2e9 /arch/x86/include/asm/boot.h
parent93c9d7f60c0cb7715890b1f9e159da6f4d1f5a65 (diff)
parent6fc108a08dcddf8f9113cc7102ddaacf7ed37a6b (diff)
downloadlinux-2.6.34-ux500-b7723f9d21d8d6043e63f5e3e412f321f5f1900c.tar.gz
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Clean up arch/x86/Kconfig* x86-64: Don't export init_level4_pgt
Diffstat (limited to 'arch/x86/include/asm/boot.h')
-rw-r--r--arch/x86/include/asm/boot.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 7a1065958ba..3b62ab56c7a 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -24,7 +24,7 @@
#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)
#if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \
- (CONFIG_PHYSICAL_ALIGN < (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2))
+ (CONFIG_PHYSICAL_ALIGN < MIN_KERNEL_ALIGN)
#error "Invalid value for CONFIG_PHYSICAL_ALIGN"
#endif