Commit 1eeb66a1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

move die notifier handling to common code 



This patch moves the die notifier handling to common code.  Previous
various architectures had exactly the same code for it.  Note that the new
code is compiled unconditionally, this should be understood as an appel to
the other architecture maintainer to implement support for it aswell (aka
sprinkling a notify_die or two in the proper place)

arm had a notifiy_die that did something totally different, I renamed it to
arm_notify_die as part of the patch and made it static to the file it's
declared and used at.  avr32 used to pass slightly less information through
this interface and I brought it into line with the other architectures.

[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: fix vmalloc_sync_all bustage]
[bryan.wu@analog.com: fix vmalloc_sync_all in nommu]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: <linux-arch@vger.kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e3869792

arch/arm/kernel/traps.c

+7 −7
Original line number Diff line number Diff line
@@ -245,8 +245,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err) 
	do_exit(SIGSEGV);

}



void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,

		unsigned long err, unsigned long trap)

void arm_notify_die(const char *str, struct pt_regs *regs,

		struct siginfo *info, unsigned long err, unsigned long trap)

{

	if (user_mode(regs)) {

		current->thread.error_code = err;
@@ -330,7 +330,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) 
	info.si_code  = ILL_ILLOPC;

	info.si_addr  = pc;



	notify_die("Oops - undefined instruction", regs, &info, 0, 6);

	arm_notify_die("Oops - undefined instruction", regs, &info, 0, 6);

}



asmlinkage void do_unexp_fiq (struct pt_regs *regs)
@@ -384,7 +384,7 @@ static int bad_syscall(int n, struct pt_regs *regs) 
	info.si_addr  = (void __user *)instruction_pointer(regs) -

			 (thumb_mode(regs) ? 2 : 4);



	notify_die("Oops - bad syscall", regs, &info, n, 0);

	arm_notify_die("Oops - bad syscall", regs, &info, n, 0);



	return regs->ARM_r0;

}
@@ -428,7 +428,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) 
		info.si_code  = SEGV_MAPERR;

		info.si_addr  = NULL;



		notify_die("branch through zero", regs, &info, 0, 0);

		arm_notify_die("branch through zero", regs, &info, 0, 0);

		return 0;



	case NR(breakpoint): /* SWI BREAK_POINT */
@@ -564,7 +564,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) 
	info.si_addr  = (void __user *)instruction_pointer(regs) -

			 (thumb_mode(regs) ? 2 : 4);



	notify_die("Oops - bad syscall(2)", regs, &info, no, 0);

	arm_notify_die("Oops - bad syscall(2)", regs, &info, no, 0);

	return 0;

}
@@ -638,7 +638,7 @@ baddataabort(int code, unsigned long instr, struct pt_regs *regs) 
	info.si_code  = ILL_ILLOPC;

	info.si_addr  = (void __user *)addr;



	notify_die("unknown data abort code", regs, &info, instr, 0);

	arm_notify_die("unknown data abort code", regs, &info, instr, 0);

}



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

arch/arm/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	info.si_errno = 0;

	info.si_code  = inf->code;

	info.si_addr  = (void __user *)addr;

	notify_die("", regs, &info, fsr, 0);

	arm_notify_die("", regs, &info, fsr, 0);

}



asmlinkage void __exception

arch/avr32/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/ptrace.h>



#include <asm/cacheflush.h>

#include <asm/kdebug.h>

#include <linux/kdebug.h>

#include <asm/ocd.h>



DEFINE_PER_CPU(struct kprobe *, current_kprobe);

arch/avr32/kernel/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <asm/uaccess.h>

#include <asm/ocd.h>

#include <asm/mmu_context.h>

#include <asm/kdebug.h>

#include <linux/kdebug.h>



static struct pt_regs *get_user_regs(struct task_struct *tsk)

{
@@ -300,7 +300,7 @@ asmlinkage void do_debug_priv(struct pt_regs *regs) 
	else

		die_val = DIE_BREAKPOINT;



	if (notify_die(die_val, regs, 0, SIGTRAP) == NOTIFY_STOP)

	if (notify_die(die_val, "ptrace", regs, 0, 0, SIGTRAP) == NOTIFY_STOP)

		return;



	if (likely(ds & DS_SSS)) {

arch/avr32/kernel/traps.c

+0 −14
Original line number Diff line number Diff line
@@ -20,20 +20,6 @@ 
#include <asm/sysreg.h>

#include <asm/traps.h>



ATOMIC_NOTIFIER_HEAD(avr32_die_chain);



int register_die_notifier(struct notifier_block *nb)

{

	return atomic_notifier_chain_register(&avr32_die_chain, nb);

}

EXPORT_SYMBOL(register_die_notifier);



int unregister_die_notifier(struct notifier_block *nb)

{

	return atomic_notifier_chain_unregister(&avr32_die_chain, nb);

}

EXPORT_SYMBOL(unregister_die_notifier);



static DEFINE_SPINLOCK(die_lock);



void NORET_TYPE die(const char *str, struct pt_regs *regs, long err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE