Merge branch 'iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / arch / cris / include / asm / thread_info.h

diff --git a/arch/cris/include/asm/thread_info.h b/arch/cris/include/asm/thread_info.h
index 55dede1..7286db5 100644 (file)
--- a/arch/cris/include/asm/thread_info.h
+++ b/arch/cris/include/asm/thread_info.h
@@ -38,7 +38,6 @@ struct thread_info {
                                                   0-0xBFFFFFFF for user-thead
                                                   0-0xFFFFFFFF for kernel-thread
                                                */
-       struct restart_block    restart_block;
        __u8                    supervisor_stack[0];
 };
 
@@ -56,9 +55,6 @@ struct thread_info {
        .cpu            = 0,                            \
        .preempt_count  = INIT_PREEMPT_COUNT,           \
        .addr_limit     = KERNEL_DS,                    \
-       .restart_block = {                              \
-                      .fn = do_no_restart_syscall,     \
-       },                                              \
 }
 
 #define init_thread_info       (init_thread_union.thread_info)