Skip to content

Commit

Permalink
[S390] cleanup program check handler prototypes
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Martin Schwidefsky committed Jul 24, 2011
1 parent f7850c9 commit fdb204d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
7 changes: 3 additions & 4 deletions arch/s390/kernel/entry.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
#include <linux/signal.h>
#include <asm/ptrace.h>

typedef void pgm_check_handler_t(struct pt_regs *, long, unsigned long);
extern pgm_check_handler_t *pgm_check_table[128];
pgm_check_handler_t do_protection_exception;
pgm_check_handler_t do_dat_exception;
void do_protection_exception(struct pt_regs *, long, unsigned long);
void do_dat_exception(struct pt_regs *, long, unsigned long);
void do_asce_exception(struct pt_regs *, long, unsigned long);

extern int sysctl_userprocess_debug;

Expand Down
13 changes: 4 additions & 9 deletions arch/s390/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,10 @@
#include <asm/debug.h>
#include "entry.h"

pgm_check_handler_t *pgm_check_table[128];
void (*pgm_check_table[128])(struct pt_regs *, long, unsigned long);

int show_unhandled_signals;

extern pgm_check_handler_t do_protection_exception;
extern pgm_check_handler_t do_dat_exception;
extern pgm_check_handler_t do_asce_exception;

#define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; })

#ifndef CONFIG_64BIT
Expand Down Expand Up @@ -489,9 +485,8 @@ static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,


#ifdef CONFIG_MATHEMU
asmlinkage void specification_exception(struct pt_regs *regs,
long pgm_int_code,
unsigned long trans_exc_code)
void specification_exception(struct pt_regs *regs, long pgm_int_code,
unsigned long trans_exc_code)
{
__u8 opcode[6];
__u16 __user *location = NULL;
Expand Down Expand Up @@ -648,7 +643,7 @@ static void space_switch_exception(struct pt_regs *regs, long pgm_int_code,
do_trap(pgm_int_code, SIGILL, "space switch event", regs, &info);
}

asmlinkage void __kprobes kernel_stack_overflow(struct pt_regs * regs)
void __kprobes kernel_stack_overflow(struct pt_regs * regs)
{
bust_spinlocks(1);
printk("Kernel stack overflow.\n");
Expand Down

0 comments on commit fdb204d

Please sign in to comment.