[IA64] fix allmodconfig compilation breakage.
authorIsaku Yamahata <yamahata@valinux.co.jp>
Sat, 18 Apr 2009 03:15:23 +0000 (12:15 +0900)
committerTony Luck <tony.luck@intel.com>
Mon, 20 Apr 2009 16:46:29 +0000 (09:46 -0700)
This patch fixes the following compilation error caused by recursive
inclusion of kernel.h which defines BUILD_BUG_ON().
In this case, the case it catches will be caught by the case
CONFIG_PARAVIRT=n, so removing it would not hurt compile time check
very much. So fix the breakage by removing it.

  CC      arch/ia64/kernel/asm-offsets.s
In file included from include/linux/bitops.h:17,
                 from include/linux/kernel.h:15,
                 from include/linux/sched.h:52,
                 from arch/ia64/kernel/asm-offsets.c:9:
arch/ia64/include/asm/bitops.h: In function 'set_bit':
arch/ia64/include/asm/bitops.h:47: error: implicit declaration of function 'BUILD_BUG_ON'

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/include/asm/paravirt_privop.h

index 3d2951130b5ff94ca3d05e434100e1b0918bbb95..8f6cb11c9fae3203501cf2300580e0e0c1c3b78e 100644 (file)
@@ -445,7 +445,6 @@ paravirt_set_rr0_to_rr4(unsigned long val0, unsigned long val1,
                register unsigned long ia64_intri_res asm ("r8");       \
                register unsigned long __reg asm ("r8") = (reg);        \
                                                                        \
-               BUILD_BUG_ON(!__builtin_constant_p(reg));               \
                asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
                                                  PARAVIRT_TYPE(GETREG) \
                                                  + (reg))              \
@@ -464,7 +463,6 @@ paravirt_set_rr0_to_rr4(unsigned long val0, unsigned long val1,
                register unsigned long ia64_clobber1 asm ("r8");        \
                register unsigned long ia64_clobber2 asm ("r9");        \
                                                                        \
-               BUILD_BUG_ON(!__builtin_constant_p(reg));               \
                asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
                                                  PARAVIRT_TYPE(SETREG) \
                                                  + (reg))              \