4 files changed, 2 insertions, 7 deletions

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 73e259834e10..8d6f87169577 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -82,8 +82,6 @@ struct thread_struct {
         unsigned long prot_addr;        /* address of protection-excep.     */
         unsigned int trap_no;
         per_struct per_info;
-        /* Used to give failing instruction back to user for ieee exceptions */
-        unsigned long ieee_instruction_pointer; 
         /* pfault_wait is used to block the process on a pfault event */
         unsigned long pfault_wait;
 };
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index e2c218dc68a6..d9d42b1e46fa 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -481,8 +481,7 @@ struct user_regs_struct
          * watchpoints. This is the way intel does it.
          */
         per_struct per_info;
-        unsigned long ieee_instruction_pointer; 
-        /* Used to give failing instruction back to user for ieee exceptions */
+        unsigned long ieee_instruction_pointer; /* obsolete, always 0 */
 };
 
 #ifdef __KERNEL__
diff --git a/arch/s390/kernel/compat_ptrace.h b/arch/s390/kernel/compat_ptrace.h
index 123dd660d7fb..3141025724f4 100644
--- a/arch/s390/kernel/compat_ptrace.h
+++ b/arch/s390/kernel/compat_ptrace.h
@@ -51,8 +51,7 @@ struct user_regs_struct32
          * watchpoints. This is the way intel does it.
          */
         per_struct32 per_info;
-        u32  ieee_instruction_pointer; 
-        /* Used to give failing instruction back to user for ieee exceptions */
+        u32  ieee_instruction_pointer;  /* obsolete, always 0 */
 };
 
 struct user32 {
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index e9b063e7d75f..70640822621a 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -447,7 +447,6 @@ static inline void do_fp_trap(struct pt_regs *regs, void __user *location,
                 else if (fpc & 0x0800) /* inexact */
                         si.si_code = FPE_FLTRES;
         }
-        current->thread.ieee_instruction_pointer = (addr_t) location;
         do_trap(pgm_int_code, SIGFPE,
                 "floating point exception", regs, &si);
 }