mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2024-11-24 12:29:53 +00:00
[PATCH] remove all kernel BUGs
This patch eliminates all kernel BUGs, trims about 35k off the typical kernel, and makes the system slightly faster. Signed-off-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
e43379f10b
commit
c8538a7aa5
@ -1,6 +1,7 @@
|
||||
#ifndef _ALPHA_BUG_H
|
||||
#define _ALPHA_BUG_H
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#include <asm/pal.h>
|
||||
|
||||
/* ??? Would be nice to use .gprel32 here, but we can't be sure that the
|
||||
@ -10,6 +11,8 @@
|
||||
: : "i" (PAL_bugchk), "i"(__LINE__), "i"(__FILE__))
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
extern volatile void __bug(const char *file, int line, void *data);
|
||||
|
||||
@ -17,6 +18,8 @@ extern volatile void __bug(const char *file, int line, void *data);
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
extern volatile void __bug(const char *file, int line, void *data);
|
||||
/* give file/line information */
|
||||
@ -12,6 +13,8 @@ extern volatile void __bug(const char *file, int line, void *data);
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -13,6 +13,7 @@
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
/*
|
||||
* Tell the user there is some problem.
|
||||
*/
|
||||
@ -45,6 +46,7 @@ do { \
|
||||
#define HAVE_ARCH_KGDB_BAD_PAGE
|
||||
#define kgdb_bad_page(page) do { kgdb_raise(SIGABRT); } while(0)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#ifndef HAVE_ARCH_BUG
|
||||
#define BUG() do { \
|
||||
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
|
||||
@ -31,4 +32,22 @@
|
||||
} while (0)
|
||||
#endif
|
||||
|
||||
#else /* !CONFIG_BUG */
|
||||
#ifndef HAVE_ARCH_BUG
|
||||
#define BUG()
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_ARCH_PAGE_BUG
|
||||
#define PAGE_BUG(page) do { if (page) ; } while (0)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_ARCH_BUG_ON
|
||||
#define BUG_ON(condition) do { if (condition) ; } while(0)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_ARCH_WARN_ON
|
||||
#define WARN_ON(condition) do { if (condition) ; } while(0)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -9,6 +9,8 @@
|
||||
* undefined" opcode for parsing in the trap handler.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#define HAVE_ARCH_BUG
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
#define BUG() \
|
||||
__asm__ __volatile__( "ud2\n" \
|
||||
@ -18,8 +20,7 @@
|
||||
#else
|
||||
#define BUG() __asm__ __volatile__("ud2\n")
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
#endif
|
||||
|
@ -1,6 +1,7 @@
|
||||
#ifndef _ASM_IA64_BUG_H
|
||||
#define _ASM_IA64_BUG_H
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
|
||||
# define ia64_abort() __builtin_trap()
|
||||
#else
|
||||
@ -8,8 +9,10 @@
|
||||
#endif
|
||||
#define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0)
|
||||
|
||||
/* should this BUG should be made generic? */
|
||||
/* should this BUG be made generic? */
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
#ifndef CONFIG_SUN3
|
||||
#define BUG() do { \
|
||||
@ -22,6 +23,8 @@
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -3,12 +3,14 @@
|
||||
|
||||
#include <asm/break.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#define HAVE_ARCH_BUG
|
||||
#define BUG() \
|
||||
do { \
|
||||
__asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \
|
||||
} while (0)
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -1,12 +1,14 @@
|
||||
#ifndef _PARISC_BUG_H
|
||||
#define _PARISC_BUG_H
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#define HAVE_ARCH_BUG
|
||||
#define BUG() do { \
|
||||
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
|
||||
dump_stack(); \
|
||||
panic("BUG!"); \
|
||||
} while (0)
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
#endif
|
||||
|
@ -14,6 +14,7 @@ struct bug_entry {
|
||||
*/
|
||||
#define BUG_WARNING_TRAP 0x1000000
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#define BUG() do { \
|
||||
__asm__ __volatile__( \
|
||||
"1: twi 31,0,0\n" \
|
||||
@ -50,6 +51,8 @@ struct bug_entry {
|
||||
#define HAVE_ARCH_BUG
|
||||
#define HAVE_ARCH_BUG_ON
|
||||
#define HAVE_ARCH_WARN_ON
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -26,6 +26,8 @@ struct bug_entry *find_bug(unsigned long bugaddr);
|
||||
*/
|
||||
#define BUG_WARNING_TRAP 0x1000000
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
|
||||
#define BUG() do { \
|
||||
__asm__ __volatile__( \
|
||||
"1: twi 31,0,0\n" \
|
||||
@ -55,11 +57,12 @@ struct bug_entry *find_bug(unsigned long bugaddr);
|
||||
"i" (__FILE__), "i" (__FUNCTION__)); \
|
||||
} while (0)
|
||||
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#define HAVE_ARCH_BUG_ON
|
||||
#define HAVE_ARCH_WARN_ON
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -3,12 +3,15 @@
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#define BUG() do { \
|
||||
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
|
||||
__asm__ __volatile__(".long 0"); \
|
||||
} while (0)
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
/*
|
||||
* Tell the user there is some problem.
|
||||
*/
|
||||
@ -12,6 +13,8 @@
|
||||
} while (0)
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -1,6 +1,7 @@
|
||||
#ifndef _SPARC_BUG_H
|
||||
#define _SPARC_BUG_H
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
/* Only use the inline asm until a gcc release that can handle __builtin_trap
|
||||
* -rob 2003-06-25
|
||||
*
|
||||
@ -26,6 +27,8 @@ extern void do_BUG(const char *file, int line);
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -1,6 +1,7 @@
|
||||
#ifndef _SPARC64_BUG_H
|
||||
#define _SPARC64_BUG_H
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
@ -14,6 +15,8 @@ extern void do_BUG(const char *file, int line);
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
@ -14,9 +14,12 @@
|
||||
#ifndef __V850_BUG_H__
|
||||
#define __V850_BUG_H__
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
extern void __bug (void) __attribute__ ((noreturn));
|
||||
#define BUG() __bug()
|
||||
#define HAVE_ARCH_BUG
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif /* __V850_BUG_H__ */
|
||||
|
@ -15,11 +15,13 @@ struct bug_frame {
|
||||
unsigned short line;
|
||||
} __attribute__((packed));
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#define HAVE_ARCH_BUG
|
||||
#define BUG() \
|
||||
asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \
|
||||
"i"(__LINE__), "i" (__stringify(__FILE__)))
|
||||
void out_of_line_bug(void);
|
||||
#include <asm-generic/bug.h>
|
||||
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bug.h>
|
||||
#endif
|
||||
|
10
init/Kconfig
10
init/Kconfig
@ -275,6 +275,16 @@ config KALLSYMS_EXTRA_PASS
|
||||
reported. KALLSYMS_EXTRA_PASS is only a temporary workaround while
|
||||
you wait for kallsyms to be fixed.
|
||||
|
||||
config BUG
|
||||
bool "BUG() support" if EMBEDDED
|
||||
default y
|
||||
help
|
||||
Disabling this option eliminates support for BUG and WARN, reducing
|
||||
the size of your kernel image and potentially quietly ignoring
|
||||
numerous fatal conditions. You should only consider disabling this
|
||||
option for embedded systems with no facilities for reporting errors.
|
||||
Just say Y.
|
||||
|
||||
config BASE_FULL
|
||||
default y
|
||||
bool "Enable full-sized data structures for core" if EMBEDDED
|
||||
|
@ -108,6 +108,7 @@ config DEBUG_HIGHMEM
|
||||
|
||||
config DEBUG_BUGVERBOSE
|
||||
bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
|
||||
depends on BUG
|
||||
depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || (X86 && !X86_64) || FRV
|
||||
default !EMBEDDED
|
||||
help
|
||||
|
Loading…
Reference in New Issue
Block a user