1 files changed, 1 insertions, 5 deletions

diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index 0be6c681cab1..72489799cf02 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -43,7 +43,6 @@ struct thread_info {
         int             cpu;                    /* cpu we're on */
         int             preempt_count;          /* 0 => preemptable,
                                                    <0 => BUG */
-        struct restart_block restart_block;
         unsigned long   local_flags;            /* private flags for thread */
 
         /* low level flags - has atomic operations done on it */
@@ -59,9 +58,6 @@ struct thread_info {
         .exec_domain =  &default_exec_domain,   \
         .cpu =          0,                      \
         .preempt_count = INIT_PREEMPT_COUNT,    \
-        .restart_block = {                      \
-                .fn = do_no_restart_syscall,    \
-        },                                      \
         .flags =        0,                      \
 }
 
@@ -125,7 +121,7 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
 #define _TIF_EMULATE_STACK_STORE        (1<<TIF_EMULATE_STACK_STORE)
 #define _TIF_NOHZ               (1<<TIF_NOHZ)
-#define _TIF_SYSCALL_T_OR_A     (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
+#define _TIF_SYSCALL_DOTRACE    (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
                                  _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
                                  _TIF_NOHZ)