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

Commit 7174d852 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

[ARM] 3983/2: remove unused argument to __bug() 



It appears that include/asm-arm/bug.h requires include/linux/stddef.h
for the definition of NULL. It seems that stddef.h was always included
indirectly in most cases, and that issue was properly fixed a while ago.

Then commit 5047f09b incorrectly reverted
change from commit ff10952a (bad dwmw2)
and the problem recently resurfaced.

Because the third argument to __bug() is never used anyway, RMK suggested
getting rid of it entirely instead of readding #include <linux/stddef.h>
which this patch does.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ca7aa4de

arch/arm/kernel/traps.c

+2 −5
Original line number Diff line number Diff line
@@ -631,12 +631,9 @@ baddataabort(int code, unsigned long instr, struct pt_regs *regs) 
	notify_die("unknown data abort code", regs, &info, instr, 0);

}



void __attribute__((noreturn)) __bug(const char *file, int line, void *data)

void __attribute__((noreturn)) __bug(const char *file, int line)

{

	printk(KERN_CRIT"kernel BUG at %s:%d!", file, line);

	if (data)

		printk(" - extra data = %p", data);

	printk("\n");

	printk(KERN_CRIT"kernel BUG at %s:%d!\n", file, line);

	*(int *)0 = 0;



	/* Avoid "noreturn function does return" */

include/asm-arm/bug.h

+2 −2
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 


#ifdef CONFIG_BUG

#ifdef CONFIG_DEBUG_BUGVERBOSE

extern void __bug(const char *file, int line, void *data) __attribute__((noreturn));

extern void __bug(const char *file, int line) __attribute__((noreturn));



/* give file/line information */

#define BUG()		__bug(__FILE__, __LINE__, NULL)

#define BUG()		__bug(__FILE__, __LINE__)



#else