diff options
author | Christoph Hellwig <hch@lst.de> | 2007-05-04 12:47:46 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-05-04 12:48:24 -0400 |
commit | 33464e3b57834e161add62b499492cf43e35e54c (patch) | |
tree | bd78272d5e723fcfd08b2f4d8ce6f7ec7c6c1492 /arch/s390/kernel | |
parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) |
[S390] get rid of kprobes notifier call chain.
And here's a port of the powerpc patch to get rid of the notifier
chain completely to s390. It's ontop of Martins patch as that one
is in mainline already.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/kprobes.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 993f35381496..23c61f6d965b 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c | |||
@@ -516,7 +516,7 @@ out: | |||
516 | return 1; | 516 | return 1; |
517 | } | 517 | } |
518 | 518 | ||
519 | static int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) | 519 | int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) |
520 | { | 520 | { |
521 | struct kprobe *cur = kprobe_running(); | 521 | struct kprobe *cur = kprobe_running(); |
522 | struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); | 522 | struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); |
@@ -603,7 +603,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, | |||
603 | ret = NOTIFY_STOP; | 603 | ret = NOTIFY_STOP; |
604 | break; | 604 | break; |
605 | case DIE_TRAP: | 605 | case DIE_TRAP: |
606 | case DIE_PAGE_FAULT: | ||
607 | /* kprobe_running() needs smp_processor_id() */ | 606 | /* kprobe_running() needs smp_processor_id() */ |
608 | preempt_disable(); | 607 | preempt_disable(); |
609 | if (kprobe_running() && | 608 | if (kprobe_running() && |