aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/traps.c
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2011-01-05 06:47:25 -0500
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2011-01-05 06:47:24 -0500
commit860dba45e81be2e1ba977617652ae36084daebaf (patch)
treeedeb79a565754fcec0d6bcfb225e36ad761cba48 /arch/s390/kernel/traps.c
parent4a1886358b2d68f6f8745bfc10399c2376681acc (diff)
[S390] add kprobes annotations
Add kprobes annotations to get the massive 'probe kernel.function("*") {}' stress test working. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/traps.c')
-rw-r--r--arch/s390/kernel/traps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 70640822621a..bc4f32fcfa57 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -451,8 +451,8 @@ static inline void do_fp_trap(struct pt_regs *regs, void __user *location,
451 "floating point exception", regs, &si); 451 "floating point exception", regs, &si);
452} 452}
453 453
454static void illegal_op(struct pt_regs *regs, long pgm_int_code, 454static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
455 unsigned long trans_exc_code) 455 unsigned long trans_exc_code)
456{ 456{
457 siginfo_t info; 457 siginfo_t info;
458 __u8 opcode[6]; 458 __u8 opcode[6];
@@ -688,7 +688,7 @@ static void space_switch_exception(struct pt_regs *regs, long pgm_int_code,
688 do_trap(pgm_int_code, SIGILL, "space switch event", regs, &info); 688 do_trap(pgm_int_code, SIGILL, "space switch event", regs, &info);
689} 689}
690 690
691asmlinkage void kernel_stack_overflow(struct pt_regs * regs) 691asmlinkage void __kprobes kernel_stack_overflow(struct pt_regs * regs)
692{ 692{
693 bust_spinlocks(1); 693 bust_spinlocks(1);
694 printk("Kernel stack overflow.\n"); 694 printk("Kernel stack overflow.\n");