diff options
| author | Ley Foon Tan <lftan@altera.com> | 2015-04-08 13:44:18 +0800 |
|---|---|---|
| committer | Ley Foon Tan <lftan@altera.com> | 2015-04-08 13:45:16 +0800 |
| commit | 7587d12647f1d952a4fbe5fb54a52e98b5509dcc (patch) | |
| tree | c05a6b5b04ddc6f0d40ac1e69f0ec1b67822db4b | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| download | blackbird-obmc-linux-7587d12647f1d952a4fbe5fb54a52e98b5509dcc.tar.gz blackbird-obmc-linux-7587d12647f1d952a4fbe5fb54a52e98b5509dcc.zip | |
nios2: signal: Move restart_block to struct task_struct
See https://lkml.org/lkml/2014/10/29/643 and commit f56141e3e2d9
("all arches, signal: move restart_block to struct task_struct")
Signed-off-by: Ley Foon Tan <lftan@altera.com>
| -rw-r--r-- | arch/nios2/include/asm/thread_info.h | 4 | ||||
| -rw-r--r-- | arch/nios2/kernel/signal.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/nios2/include/asm/thread_info.h b/arch/nios2/include/asm/thread_info.h index 1f266575beb5..a16e55cbd8ad 100644 --- a/arch/nios2/include/asm/thread_info.h +++ b/arch/nios2/include/asm/thread_info.h @@ -47,7 +47,6 @@ struct thread_info { 0-0x7FFFFFFF for user-thead 0-0xFFFFFFFF for kernel-thread */ - struct restart_block restart_block; struct pt_regs *regs; }; @@ -64,9 +63,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) diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c index dda41e4fe707..20662b0f6c9e 100644 --- a/arch/nios2/kernel/signal.c +++ b/arch/nios2/kernel/signal.c @@ -43,7 +43,7 @@ static inline int rt_restore_ucontext(struct pt_regs *regs, int err; /* Always make any pending restarted system calls return -EINTR */ - current_thread_info()->restart_block.fn = do_no_restart_syscall; + current->restart_block.fn = do_no_restart_syscall; err = __get_user(temp, &uc->uc_mcontext.version); if (temp != MCONTEXT_VERSION) |
