1 files changed, 3 insertions, 9 deletions

diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index 798f0279a4b5..ff455164732a 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -58,8 +58,6 @@ struct thread_info {
         unsigned long           gsr[7];
         unsigned long           xfsr[7];
 
-        struct restart_block    restart_block;
-
         struct pt_regs          *kern_una_regs;
         unsigned int            kern_una_insn;
 
@@ -92,10 +90,9 @@ struct thread_info {
 #define TI_RWIN_SPTRS   0x000003c8
 #define TI_GSR          0x00000400
 #define TI_XFSR         0x00000438
-#define TI_RESTART_BLOCK 0x00000470
-#define TI_KUNA_REGS    0x000004a0
-#define TI_KUNA_INSN    0x000004a8
-#define TI_FPREGS       0x000004c0
+#define TI_KUNA_REGS    0x00000470
+#define TI_KUNA_INSN    0x00000478
+#define TI_FPREGS       0x00000480
 
 /* We embed this in the uppermost byte of thread_info->flags */
 #define FAULT_CODE_WRITE        0x01    /* Write access, implies D-TLB     */
@@ -124,9 +121,6 @@ struct thread_info {
         .current_ds     =       ASI_P,                  \
         .exec_domain    =       &default_exec_domain,   \
         .preempt_count  =       INIT_PREEMPT_COUNT,     \
-        .restart_block  = {                             \
-                .fn     =       do_no_restart_syscall,  \
-        },                                              \
 }
 
 #define init_thread_info        (init_thread_union.thread_info)