On Wed, 3 Dec 2014 16:12:30 -0800 Andy Lutomirski <luto@xxxxxxxxxxxxxx> wrote: > On Wed, Dec 3, 2014 at 4:08 PM, Russell King <rmk@xxxxxxxxxxxxxxxx> wrote: > > On Wed, Dec 03, 2014 at 04:01:27PM -0800, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > >> @@ -221,7 +221,7 @@ asmlinkage int sys_rt_sigreturn(struct p > >> struct rt_sigframe __user *frame; > >> > >> /* 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; > >> > >> /* > >> * Since we stacked the signal on a 64-bit boundary, > >> diff -puN arch/arm/kernel/traps.c~all-arches-signal-move-restart_block-to-struct-task_struct arch/arm/kernel/traps.c > >> diff -puN arch/arm64/include/asm/thread_info.h~all-arches-signal-move-restart_block-to-struct-task_struct arch/arm64/include/asm/thread_info.h > >> --- a/arch/arm64/include/asm/thread_info.h~all-arches-signal-move-restart_block-to-struct-task_struct > >> +++ a/arch/arm64/include/asm/thread_info.h > > > > Andrew, > > > > Did a change to arch/arm/kernel/traps.c get lost here? > > > > I think this is correct, due to: > > commit 3f4aa45ceea5789a4aade536acc27f2e0d3da5e1 > Author: Vladimir Murzin <vladimir.murzin@xxxxxxx> > Date: Thu Nov 27 11:39:04 2014 +0100 > > ARM: 8226/1: cacheflush: get rid of restarting block > Yes. And unfortunately I don't have an automated (ie: nice patch rejects) way of knowing whether 3f4aa45ceea5789 is present when I merge Andy's patch. However the arm build will break so the fix will be quick and trivial (I do arm allnoconfig and defconfig occasionally, but not reliably). But probably 3f4aa45ceea5789a4aa will be present in 3.19-final so no probs. -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
