2 files changed, 1 insertions, 6 deletions

diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h
index 48bbea6898b3..d5b98ab514bb 100644
--- a/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@@ -27,8 +27,6 @@ struct thread_info {
         int bpt_nsaved;
         unsigned long bpt_addr[2];              /* breakpoint handling  */
         unsigned int bpt_insn[2];
-
-        struct restart_block    restart_block;
 };
 
 /*
@@ -40,9 +38,6 @@ struct thread_info {
         .exec_domain    = &default_exec_domain, \
         .addr_limit     = KERNEL_DS,            \
         .preempt_count  = INIT_PREEMPT_COUNT,   \
-        .restart_block = {                      \
-                .fn = do_no_restart_syscall,    \
-        },                                      \
 }
 
 #define init_thread_info        (init_thread_union.thread_info)
diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 6cec2881acbf..8dbfb15f1745 100644
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -150,7 +150,7 @@ restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs)
         struct switch_stack *sw = (struct switch_stack *)regs - 1;
         long i, err = __get_user(regs->pc, &sc->sc_pc);
 
-        current_thread_info()->restart_block.fn = do_no_restart_syscall;
+        current->restart_block.fn = do_no_restart_syscall;
 
         sw->r26 = (unsigned long) ret_from_sys_call;