diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-26 23:51:59 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-26 23:51:59 -0400 |
commit | bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119 (patch) | |
tree | 30180a33fb5bb9a5c633e93d533b7f4ffc800e2e /arch/ppc64/kernel/kprobes.c | |
parent | 51a0885ed7f883758462926b35fbd6f09f9c717c (diff) |
powerpc: clean up after powermac build merge
Complete moving arch/ppc64/kernel/mpic.h,
include/asm-ppc/reg.h, include/asm-ppc64/kdebug.h
and include/asm-ppc64/kprobes.h
Add arch/powerpc/platforms/Makefile and use it from
arch/powerpc/Makefile
Introduce OLDARCH temporarily so we can point back to
the originating architecture
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/ppc64/kernel/kprobes.c')
-rw-r--r-- | arch/ppc64/kernel/kprobes.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/kprobes.c b/arch/ppc64/kernel/kprobes.c index 7e80d49c589a..abb90e67534a 100644 --- a/arch/ppc64/kernel/kprobes.c +++ b/arch/ppc64/kernel/kprobes.c | |||
@@ -395,7 +395,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, | |||
395 | if (post_kprobe_handler(args->regs)) | 395 | if (post_kprobe_handler(args->regs)) |
396 | ret = NOTIFY_STOP; | 396 | ret = NOTIFY_STOP; |
397 | break; | 397 | break; |
398 | case DIE_GPF: | ||
399 | case DIE_PAGE_FAULT: | 398 | case DIE_PAGE_FAULT: |
400 | if (kprobe_running() && | 399 | if (kprobe_running() && |
401 | kprobe_fault_handler(args->regs, args->trapnr)) | 400 | kprobe_fault_handler(args->regs, args->trapnr)) |