diff options
| author | Linus Torvalds | 2007-05-17 06:20:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-05-17 06:20:28 +0200 |
| commit | 36dbe4d6bffb90fcb2663ac50af00a942412e246 (patch) | |
| tree | 4d24a2165620fa8fad0454299a8f5412555bba61 /arch/avr32/kernel/kprobes.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | [AVR32] Implement platform hooks for atmel_lcdfb driver (diff) | |
| download | kernel-qcow2-linux-36dbe4d6bffb90fcb2663ac50af00a942412e246.tar.gz kernel-qcow2-linux-36dbe4d6bffb90fcb2663ac50af00a942412e246.tar.xz kernel-qcow2-linux-36dbe4d6bffb90fcb2663ac50af00a942412e246.zip | |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
[AVR32] Implement platform hooks for atmel_lcdfb driver
[AVR32] Wire up signalfd, timerfd and eventfd
[AVR32] optimize pagefault path
[AVR32] Remove bogus comment in arch/avr32/kernel/irq.c
Diffstat (limited to 'arch/avr32/kernel/kprobes.c')
| -rw-r--r-- | arch/avr32/kernel/kprobes.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/avr32/kernel/kprobes.c b/arch/avr32/kernel/kprobes.c index 004c94b6fc1d..4942ee662e0b 100644 --- a/arch/avr32/kernel/kprobes.c +++ b/arch/avr32/kernel/kprobes.c @@ -179,7 +179,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs) return 1; } -static int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) +int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) { struct kprobe *cur = kprobe_running(); @@ -216,11 +216,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, if (post_kprobe_handler(args->regs)) ret = NOTIFY_STOP; break; - case DIE_FAULT: - if (kprobe_running() - && kprobe_fault_handler(args->regs, args->trapnr)) - ret = NOTIFY_STOP; - break; default: break; } |