Commit 43266838 authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Reduce size of the bug_table on 64-bit kernel by half 



Enable GENERIC_BUG_RELATIVE_POINTERS which will store 32-bit relative
offsets to the bug address and the source file name instead of 64-bit
absolute addresses. This effectively reduces the size of the
bug_table[] array by half on 64-bit kernels.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent e5f3e299

arch/parisc/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -115,9 +115,12 @@ config ARCH_HAS_ILOG2_U64 
	default n



config GENERIC_BUG

	bool

	default y

	def_bool y

	depends on BUG

	select GENERIC_BUG_RELATIVE_POINTERS if 64BIT



config GENERIC_BUG_RELATIVE_POINTERS

	bool



config GENERIC_HWEIGHT

	bool

arch/parisc/include/asm/bug.h

+17 −17
Original line number Diff line number Diff line
@@ -17,26 +17,27 @@ 
#define	PARISC_BUG_BREAK_ASM	"break 0x1f, 0x1fff"

#define	PARISC_BUG_BREAK_INSN	0x03ffe01f  /* PARISC_BUG_BREAK_ASM */



#if defined(CONFIG_64BIT)

#define ASM_WORD_INSN		".dword\t"

#ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS

# define __BUG_REL(val) ".word " __stringify(val) " - ."

#else

#define ASM_WORD_INSN		".word\t"

# define __BUG_REL(val) ".word " __stringify(val)

#endif





#ifdef CONFIG_DEBUG_BUGVERBOSE

#define BUG()								\

	do {								\

		asm volatile("\n"					\

			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\

			     "\t.pushsection __bug_table,\"a\"\n"	\

			     "\t.align %4\n"				\

			     "2:\t" ASM_WORD_INSN "1b, %c0\n"		\

			     "\t.align 4\n"				\

			     "2:\t" __BUG_REL(1b) "\n"			\

			     "\t" __BUG_REL(%c0)  "\n"			\

			     "\t.short %1, %2\n"			\

			     "\t.blockz %3-2*%4-2*2\n"			\

			     "\t.blockz %3-2*4-2*2\n"			\

			     "\t.popsection"				\

			     : : "i" (__FILE__), "i" (__LINE__),	\

			     "i" (0), "i" (sizeof(struct bug_entry)),	\

			     "i" (sizeof(long)) );			\

			     "i" (0), "i" (sizeof(struct bug_entry)) );	\

		unreachable();						\

	} while(0)
@@ -54,15 +55,15 @@ 
		asm volatile("\n"					\

			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\

			     "\t.pushsection __bug_table,\"a\"\n"	\

			     "\t.align %4\n"				\

			     "2:\t" ASM_WORD_INSN "1b, %c0\n"		\

			     "\t.align 4\n"				\

			     "2:\t" __BUG_REL(1b) "\n"			\

			     "\t" __BUG_REL(%c0)  "\n"			\

			     "\t.short %1, %2\n"			\

			     "\t.blockz %3-2*%4-2*2\n"			\

			     "\t.blockz %3-2*4-2*2\n"			\

			     "\t.popsection"				\

			     : : "i" (__FILE__), "i" (__LINE__),	\

			     "i" (BUGFLAG_WARNING|(flags)),		\

			     "i" (sizeof(struct bug_entry)),		\

			     "i" (sizeof(long)) );			\

			     "i" (sizeof(struct bug_entry)) );		\

	} while(0)

#else

#define __WARN_FLAGS(flags)						\
@@ -71,13 +72,12 @@ 
			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\

			     "\t.pushsection __bug_table,\"a\"\n"	\

			     "\t.align %2\n"				\

			     "2:\t" ASM_WORD_INSN "1b\n"		\

			     "2:\t" __BUG_REL(1b) "\n"			\

			     "\t.short %0\n"				\

			     "\t.blockz %1-%2-2\n"			\

			     "\t.blockz %1-4-2\n"			\

			     "\t.popsection"				\

			     : : "i" (BUGFLAG_WARNING|(flags)),		\

			     "i" (sizeof(struct bug_entry)),		\

			     "i" (sizeof(long)) );			\

			     "i" (sizeof(struct bug_entry)) );		\

	} while(0)

#endif