Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755375AbYAQA6v (ORCPT ); Wed, 16 Jan 2008 19:58:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752881AbYAQA54 (ORCPT ); Wed, 16 Jan 2008 19:57:56 -0500 Received: from lixom.net ([66.141.50.11]:57130 "EHLO mail.lixom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765AbYAQA5z (ORCPT ); Wed, 16 Jan 2008 19:57:55 -0500 Date: Wed, 16 Jan 2008 19:08:27 -0600 From: Olof Johansson To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Arjan van de Ven , linux-arch@vger.kernel.org Subject: [patch 1/3] bug.h: Remove HAVE_ARCH_BUG and HAVE_ARCH_WARN Message-ID: <20080117010827.GA24766@lixom.net> References: <20080117010130.GA24663@lixom.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080117010130.GA24663@lixom.net> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7634 Lines: 256 No need to have the HAVE_ARCH_BUG.* / HAVE_ARCH_WARN.* defines, when the generic implementation can just use #ifndef on the macros themselves. Signed-off-by: Olof Johansson Cc: --- include/asm-alpha/bug.h | 1 - include/asm-arm/bug.h | 1 - include/asm-avr32/bug.h | 3 --- include/asm-frv/bug.h | 1 - include/asm-generic/bug.h | 10 +++++----- include/asm-ia64/bug.h | 1 - include/asm-m68k/bug.h | 1 - include/asm-mips/bug.h | 4 ---- include/asm-parisc/bug.h | 2 -- include/asm-powerpc/bug.h | 3 --- include/asm-s390/bug.h | 2 -- include/asm-sparc/bug.h | 1 - include/asm-sparc64/bug.h | 1 - include/asm-v850/bug.h | 1 - include/asm-x86/bug.h | 1 - 15 files changed, 5 insertions(+), 28 deletions(-) Index: linux-2.6.24-rc6/include/asm-alpha/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-alpha/bug.h +++ linux-2.6.24-rc6/include/asm-alpha/bug.h @@ -10,7 +10,6 @@ __asm__ __volatile__("call_pal %0 # bugchk\n\t"".long %1\n\t.8byte %2" \ : : "i" (PAL_bugchk), "i"(__LINE__), "i"(__FILE__)) -#define HAVE_ARCH_BUG #endif #include Index: linux-2.6.24-rc6/include/asm-arm/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-arm/bug.h +++ linux-2.6.24-rc6/include/asm-arm/bug.h @@ -16,7 +16,6 @@ extern void __bug(const char *file, int #endif -#define HAVE_ARCH_BUG #endif #include Index: linux-2.6.24-rc6/include/asm-avr32/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-avr32/bug.h +++ linux-2.6.24-rc6/include/asm-avr32/bug.h @@ -63,9 +63,6 @@ unlikely(__ret_warn_on); \ }) -#define HAVE_ARCH_BUG -#define HAVE_ARCH_WARN_ON - #endif /* CONFIG_BUG */ #include Index: linux-2.6.24-rc6/include/asm-frv/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-frv/bug.h +++ linux-2.6.24-rc6/include/asm-frv/bug.h @@ -32,7 +32,6 @@ do { \ asm volatile("nop"); \ } while(0) -#define HAVE_ARCH_BUG #define BUG() \ do { \ _debug_bug_printk(); \ Index: linux-2.6.24-rc6/include/asm-generic/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-generic/bug.h +++ linux-2.6.24-rc6/include/asm-generic/bug.h @@ -20,14 +20,14 @@ struct bug_entry { #define BUGFLAG_WARNING (1<<0) #endif /* CONFIG_GENERIC_BUG */ -#ifndef HAVE_ARCH_BUG +#ifndef BUG #define BUG() do { \ printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \ panic("BUG!"); \ } while (0) #endif -#ifndef HAVE_ARCH_BUG_ON +#ifndef BUG_ON #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while(0) #endif @@ -49,15 +49,15 @@ extern void warn_on_slowpath(const char #endif #else /* !CONFIG_BUG */ -#ifndef HAVE_ARCH_BUG +#ifndef BUG #define BUG() #endif -#ifndef HAVE_ARCH_BUG_ON +#ifndef BUG_ON #define BUG_ON(condition) do { if (condition) ; } while(0) #endif -#ifndef HAVE_ARCH_WARN_ON +#ifndef WARN_ON #define WARN_ON(condition) ({ \ int __ret_warn_on = !!(condition); \ unlikely(__ret_warn_on); \ Index: linux-2.6.24-rc6/include/asm-ia64/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-ia64/bug.h +++ linux-2.6.24-rc6/include/asm-ia64/bug.h @@ -6,7 +6,6 @@ #define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0) /* should this BUG be made generic? */ -#define HAVE_ARCH_BUG #endif #include Index: linux-2.6.24-rc6/include/asm-m68k/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-m68k/bug.h +++ linux-2.6.24-rc6/include/asm-m68k/bug.h @@ -21,7 +21,6 @@ } while (0) #endif -#define HAVE_ARCH_BUG #endif #include Index: linux-2.6.24-rc6/include/asm-mips/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-mips/bug.h +++ linux-2.6.24-rc6/include/asm-mips/bug.h @@ -12,8 +12,6 @@ do { \ __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ } while (0) -#define HAVE_ARCH_BUG - #if (_MIPS_ISA > _MIPS_ISA_MIPS1) #define BUG_ON(condition) \ @@ -22,8 +20,6 @@ do { \ : : "r" (condition), "i" (BRK_BUG)); \ } while (0) -#define HAVE_ARCH_BUG_ON - #endif /* _MIPS_ISA > _MIPS_ISA_MIPS1 */ #endif Index: linux-2.6.24-rc6/include/asm-parisc/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-parisc/bug.h +++ linux-2.6.24-rc6/include/asm-parisc/bug.h @@ -7,8 +7,6 @@ */ #ifdef CONFIG_BUG -#define HAVE_ARCH_BUG -#define HAVE_ARCH_WARN_ON /* the break instruction is used as BUG() marker. */ #define PARISC_BUG_BREAK_ASM "break 0x1f, 0x1fff" Index: linux-2.6.24-rc6/include/asm-powerpc/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-powerpc/bug.h +++ linux-2.6.24-rc6/include/asm-powerpc/bug.h @@ -109,9 +109,6 @@ unlikely(__ret_warn_on); \ }) -#define HAVE_ARCH_BUG -#define HAVE_ARCH_BUG_ON -#define HAVE_ARCH_WARN_ON #endif /* __ASSEMBLY __ */ #endif /* CONFIG_BUG */ Index: linux-2.6.24-rc6/include/asm-s390/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-s390/bug.h +++ linux-2.6.24-rc6/include/asm-s390/bug.h @@ -61,8 +61,6 @@ unlikely(__ret_warn_on); \ }) -#define HAVE_ARCH_BUG -#define HAVE_ARCH_WARN_ON #endif /* CONFIG_BUG */ #include Index: linux-2.6.24-rc6/include/asm-sparc/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-sparc/bug.h +++ linux-2.6.24-rc6/include/asm-sparc/bug.h @@ -26,7 +26,6 @@ extern void do_BUG(const char *file, int #define BUG() __bug_trap() #endif -#define HAVE_ARCH_BUG #endif #include Index: linux-2.6.24-rc6/include/asm-sparc64/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-sparc64/bug.h +++ linux-2.6.24-rc6/include/asm-sparc64/bug.h @@ -14,7 +14,6 @@ extern void do_BUG(const char *file, int #define BUG() __builtin_trap() #endif -#define HAVE_ARCH_BUG #endif #include Index: linux-2.6.24-rc6/include/asm-v850/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-v850/bug.h +++ linux-2.6.24-rc6/include/asm-v850/bug.h @@ -17,7 +17,6 @@ #ifdef CONFIG_BUG extern void __bug (void) __attribute__ ((noreturn)); #define BUG() __bug() -#define HAVE_ARCH_BUG #endif #include Index: linux-2.6.24-rc6/include/asm-x86/bug.h =================================================================== --- linux-2.6.24-rc6.orig/include/asm-x86/bug.h +++ linux-2.6.24-rc6/include/asm-x86/bug.h @@ -2,7 +2,6 @@ #define _ASM_X86_BUG_H #ifdef CONFIG_BUG -#define HAVE_ARCH_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/