Subject: [merged] x86-always-define-bug-and-have_arch_bug-even-with-config_bug.patch removed from -mm tree
To: josh@xxxxxxxxxxxxxxxx,arnd@xxxxxxxx,hpa@xxxxxxxxx,mingo@xxxxxxx,tglx@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 08 Apr 2014 14:36:33 -0700
The patch titled
Subject: x86: always define BUG() and HAVE_ARCH_BUG, even with !CONFIG_BUG
has been removed from the -mm tree. Its filename was
x86-always-define-bug-and-have_arch_bug-even-with-config_bug.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Subject: x86: always define BUG() and HAVE_ARCH_BUG, even with !CONFIG_BUG
This ensures that BUG() always has a definition that causes a trap (via an
undefined instruction), and that the compiler still recognizes the code
following BUG() as unreachable, avoiding warnings that would otherwise
appear (such as on non-void functions that don't return a value after
BUG()).
In addition to saving a few bytes over the generic infinite-loop
implementation, this implementation traps rather than looping, which
potentially allows for better error-recovery behavior (such as by
rebooting).
Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Reported-by: Arnd Bergmann <arnd@xxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/bug.h | 3 ---
1 file changed, 3 deletions(-)
diff -puN arch/x86/include/asm/bug.h~x86-always-define-bug-and-have_arch_bug-even-with-config_bug arch/x86/include/asm/bug.h
--- a/arch/x86/include/asm/bug.h~x86-always-define-bug-and-have_arch_bug-even-with-config_bug
+++ a/arch/x86/include/asm/bug.h
@@ -1,7 +1,6 @@
#ifndef _ASM_X86_BUG_H
#define _ASM_X86_BUG_H
-#ifdef CONFIG_BUG
#define HAVE_ARCH_BUG
#ifdef CONFIG_DEBUG_BUGVERBOSE
@@ -33,8 +32,6 @@ do { \
} while (0)
#endif
-#endif /* !CONFIG_BUG */
-
#include <asm-generic/bug.h>
#endif /* _ASM_X86_BUG_H */
_
Patches currently in -mm which might be from josh@xxxxxxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
