Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7587d126 authored Apr 08, 2015 by Ley Foon Tan

nios2: signal: Move restart_block to struct task_struct

See https://lkml.org/lkml/2014/10/29/643

 and commit f56141e3
("all arches, signal: move restart_block to struct task_struct")

Signed-off-by: Ley Foon Tan <lftan@altera.com>

parent f22e6e84

arch/nios2/include/asm/thread_info.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -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)

arch/nios2/kernel/signal.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)