Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25433b12 authored by Becky Bruce's avatar Becky Bruce Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Merge bug.h 



ppc32/ppc64: Merge bug.h into include/asm-powerpc

This patch merges bug.h into include/asm-powerpc.  Changed the data
structure for bug_entry such that line is always an int on both 32 and
64-bit platforms; removed casts to int from the 64-bit trap code to
reflect this.

Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarBecky Bruce <Becky.Bruce@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3e57615b

arch/ppc/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ extern struct bug_entry __start___bug_table[], __stop___bug_table[]; 
#define module_find_bug(x)	NULL

#endif



static struct bug_entry *find_bug(unsigned long bugaddr)

struct bug_entry *find_bug(unsigned long bugaddr)

{

	struct bug_entry *bug;

arch/ppc64/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -390,12 +390,12 @@ check_bug_trap(struct pt_regs *regs) 
		/* this is a WARN_ON rather than BUG/BUG_ON */

		printk(KERN_ERR "Badness in %s at %s:%d\n",

		       bug->function, bug->file,

		      (unsigned int)bug->line & ~BUG_WARNING_TRAP);

		       bug->line & ~BUG_WARNING_TRAP);

		show_stack(current, (void *)regs->gpr[1]);

		return 1;

	}

	printk(KERN_CRIT "kernel BUG in %s at %s:%d!\n",

	       bug->function, bug->file, (unsigned int)bug->line);

	       bug->function, bug->file, bug->line);

	return 0;

}

include/asm-ppc64/bug.h→include/asm-powerpc/bug.h

+25 −13
Original line number Diff line number Diff line 
#ifndef _PPC64_BUG_H

#define _PPC64_BUG_H

#ifndef _ASM_POWERPC_BUG_H

#define _ASM_POWERPC_BUG_H



/*

 * Define an illegal instr to trap on the bug.
@@ -11,9 +11,21 @@ 


#ifndef __ASSEMBLY__



#ifdef __powerpc64__

#define BUG_TABLE_ENTRY(label, line, file, func) \

	".llong " #label "\n .long " #line "\n .llong " #file ", " #func "\n"

#define TRAP_OP(ra, rb) "1: tdnei " #ra ", " #rb "\n"

#define DATA_TYPE long long

#else 

#define BUG_TABLE_ENTRY(label, line, file, func) \

	".long " #label ", " #line ", " #file ", " #func "\n"

#define TRAP_OP(ra, rb) "1: twnei " #ra ", " #rb "\n"

#define DATA_TYPE int

#endif /* __powerpc64__ */



struct bug_entry {

	unsigned long	bug_addr;

	long		line;

	int		line;

	const char	*file;

	const char	*function;

};
@@ -32,28 +44,28 @@ struct bug_entry *find_bug(unsigned long bugaddr); 
	__asm__ __volatile__(						 \

		"1:	twi 31,0,0\n"					 \

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

		"	.llong 1b,%0,%1,%2\n"				 \

		BUG_TABLE_ENTRY(1b,%0,%1,%2)				 \

		".previous"						 \

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

} while (0)



#define BUG_ON(x) do {						\

	__asm__ __volatile__(					\

		"1:	tdnei %0,0\n"				\

		TRAP_OP(%0,0)					\

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

		"	.llong 1b,%1,%2,%3\n"			\

		BUG_TABLE_ENTRY(1b,%1,%2,%3)			\

		".previous"					\

		: : "r" ((long long)(x)), "i" (__LINE__),	\

		: : "r" ((DATA_TYPE)(x)), "i" (__LINE__),	\

		    "i" (__FILE__), "i" (__FUNCTION__));	\

} while (0)



#define WARN_ON(x) do {						\

	__asm__ __volatile__(					\

		"1:	tdnei %0,0\n"				\

		TRAP_OP(%0,0)					\

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

		"	.llong 1b,%1,%2,%3\n"			\

		BUG_TABLE_ENTRY(1b,%1,%2,%3)			\

		".previous"					\

		: : "r" ((long long)(x)),			\

		: : "r" ((DATA_TYPE)(x)),			\

		    "i" (__LINE__ + BUG_WARNING_TRAP),		\

		    "i" (__FILE__), "i" (__FUNCTION__));	\

} while (0)
@@ -61,9 +73,9 @@ struct bug_entry *find_bug(unsigned long bugaddr); 
#define HAVE_ARCH_BUG

#define HAVE_ARCH_BUG_ON

#define HAVE_ARCH_WARN_ON

#endif

#endif

#endif /* CONFIG_BUG */

#endif /* __ASSEMBLY __ */



#include <asm-generic/bug.h>



#endif
 
#endif /* _ASM_POWERPC_BUG_H */

include/asm-ppc/bug.h

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
#ifndef _PPC_BUG_H

#define _PPC_BUG_H



struct bug_entry {

	unsigned long	bug_addr;

	int		line;

	const char	*file;

	const char	*function;

};



/*

 * If this bit is set in the line number it means that the trap

 * is for WARN_ON rather than BUG or BUG_ON.

 */

#define BUG_WARNING_TRAP	0x1000000



#ifdef CONFIG_BUG

#define BUG() do {							 \

	__asm__ __volatile__(						 \

		"1:	twi 31,0,0\n"					 \

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

		"	.long 1b,%0,%1,%2\n"				 \

		".previous"						 \

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

} while (0)



#define BUG_ON(x) do {							\

	if (!__builtin_constant_p(x) || (x)) {				\

		__asm__ __volatile__(					\

			"1:	twnei %0,0\n"				\

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

			"	.long 1b,%1,%2,%3\n"			\

			".previous"					\

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

			    "i" (__FUNCTION__));			\

	}								\

} while (0)



#define WARN_ON(x) do {							\

	if (!__builtin_constant_p(x) || (x)) {				\

		__asm__ __volatile__(					\

			"1:	twnei %0,0\n"				\

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

			"	.long 1b,%1,%2,%3\n"			\

			".previous"					\

			: : "r" (x), "i" (__LINE__ + BUG_WARNING_TRAP),	\

			    "i" (__FILE__), "i" (__FUNCTION__));	\

	}								\

} while (0)



#define HAVE_ARCH_BUG

#define HAVE_ARCH_BUG_ON

#define HAVE_ARCH_WARN_ON

#endif



#include <asm-generic/bug.h>



#endif