s390: remove all usages of PSW_ADDR_AMODE

[deliverable/linux.git] / arch / s390 / kernel / traps.c

diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 1b18118bbc06bbe58f846343198dc84fb5ec04b5..6a49b7d90e0dc56ae288506f320e732fb420bf1e 100644 (file)
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -71,7 +71,7 @@ void do_report_trap(struct pt_regs *regs, int si_signo, int si_code, char *str)
                 const struct exception_table_entry *fixup;
                 fixup = search_exception_tables(regs->psw.addr & PSW_ADDR_INSN);
                 if (fixup)
-                       regs->psw.addr = extable_fixup(fixup) | PSW_ADDR_AMODE;
+                       regs->psw.addr = extable_fixup(fixup);
                else {
                        enum bug_trap_type btt;
 
@@ -260,11 +260,8 @@ void vector_exception(struct pt_regs *regs)
 
 void data_exception(struct pt_regs *regs)
 {
-       __u16 __user *location;
        int signal = 0;
 
-       location = get_trap_ip(regs);
-
        save_fpu_regs();
        if (current->thread.fpu.fpc & FPC_DXC_MASK)
                signal = SIGFPE;