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

Commit 0daca12d authored by Mark Rutland's avatar Mark Rutland Committed by Greg Kroah-Hartman
Browse files

h8300: fix syscall restarting 

commit 21753583056d48a5fad964d6f272e28168426845 upstream.

Back in commit f56141e3 ("all arches, signal: move restart_block to
struct task_struct"), all architectures and core code were changed to
use task_struct::restart_block.  However, when h8300 support was
subsequently restored in v4.2, it was not updated to account for this,
and maintains thread_info::restart_block, which is not kept in sync.

This patch drops the redundant restart_block from thread_info, and moves
h8300 to the common one in task_struct, ensuring that syscall restarting
always works as expected.

Fixes: f56141e3 ("all arches, signal: move restart_block to struct task_struct")
Link: http://lkml.kernel.org/r/1476714934-11635-1-git-send-email-mark.rutland@arm.com


Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: uclinux-h8-devel@lists.sourceforge.jp
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 44084f15

arch/h8300/include/asm/thread_info.h

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct thread_info { 
	int		   cpu;			/* cpu we're on */

	int		   preempt_count;	/* 0 => preemptable, <0 => BUG */

	mm_segment_t		addr_limit;

	struct restart_block restart_block;

};



/*
@@ -44,9 +43,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/h8300/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ restore_sigcontext(struct sigcontext *usc, int *pd0) 
	unsigned int er0;



	/* 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;



	/* restore passed registers */

#define COPY(r)  do { err |= get_user(regs->r, &usc->sc_##r); } while (0)