aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2011-07-24 04:48:24 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2011-07-24 04:48:21 -0400
commitfdb204d1a7746a90b0d8a8665bf59af98c8c366a (patch)
tree6251aa44e991ecab4a29dd97cc02483fb7293794 /arch/s390
parentf7850c92884b40915001e332a0a33ed4f10158e8 (diff)
[S390] cleanup program check handler prototypes
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/entry.h7
-rw-r--r--arch/s390/kernel/traps.c13
2 files changed, 7 insertions, 13 deletions
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index 17a6f83a2d67..66729eb7bbc5 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -5,10 +5,9 @@
5#include <linux/signal.h> 5#include <linux/signal.h>
6#include <asm/ptrace.h> 6#include <asm/ptrace.h>
7 7
8typedef void pgm_check_handler_t(struct pt_regs *, long, unsigned long); 8void do_protection_exception(struct pt_regs *, long, unsigned long);
9extern pgm_check_handler_t *pgm_check_table[128]; 9void do_dat_exception(struct pt_regs *, long, unsigned long);
10pgm_check_handler_t do_protection_exception; 10void do_asce_exception(struct pt_regs *, long, unsigned long);
11pgm_check_handler_t do_dat_exception;
12 11
13extern int sysctl_userprocess_debug; 12extern int sysctl_userprocess_debug;
14 13
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index a63d34c3611e..f386e167277a 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -43,14 +43,10 @@
43#include <asm/debug.h> 43#include <asm/debug.h>
44#include "entry.h" 44#include "entry.h"
45 45
46pgm_check_handler_t *pgm_check_table[128]; 46void (*pgm_check_table[128])(struct pt_regs *, long, unsigned long);
47 47
48int show_unhandled_signals; 48int show_unhandled_signals;
49 49
50extern pgm_check_handler_t do_protection_exception;
51extern pgm_check_handler_t do_dat_exception;
52extern pgm_check_handler_t do_asce_exception;
53
54#define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; }) 50#define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; })
55 51
56#ifndef CONFIG_64BIT 52#ifndef CONFIG_64BIT
@@ -489,9 +485,8 @@ static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
489 485
490 486
491#ifdef CONFIG_MATHEMU 487#ifdef CONFIG_MATHEMU
492asmlinkage void specification_exception(struct pt_regs *regs, 488void specification_exception(struct pt_regs *regs, long pgm_int_code,
493 long pgm_int_code, 489 unsigned long trans_exc_code)
494 unsigned long trans_exc_code)
495{ 490{
496 __u8 opcode[6]; 491 __u8 opcode[6];
497 __u16 __user *location = NULL; 492 __u16 __user *location = NULL;
@@ -648,7 +643,7 @@ static void space_switch_exception(struct pt_regs *regs, long pgm_int_code,
648 do_trap(pgm_int_code, SIGILL, "space switch event", regs, &info); 643 do_trap(pgm_int_code, SIGILL, "space switch event", regs, &info);
649} 644}
650 645
651asmlinkage void __kprobes kernel_stack_overflow(struct pt_regs * regs) 646void __kprobes kernel_stack_overflow(struct pt_regs * regs)
652{ 647{
653 bust_spinlocks(1); 648 bust_spinlocks(1);
654 printk("Kernel stack overflow.\n"); 649 printk("Kernel stack overflow.\n");