Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756749AbcJZCdE (ORCPT ); Tue, 25 Oct 2016 22:33:04 -0400 Received: from mprc.pku.edu.cn ([162.105.203.9]:46950 "EHLO mprc.pku.edu.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752778AbcJZCdC (ORCPT ); Tue, 25 Oct 2016 22:33:02 -0400 Message-ID: <56314.117.114.135.40.1477449008.squirrel@mprc.pku.edu.cn> In-Reply-To: <1476775476-17024-1-git-send-email-linux@roeck-us.net> References: <1476775476-17024-1-git-send-email-linux@roeck-us.net> Date: Wed, 26 Oct 2016 10:30:08 +0800 (CST) Subject: Re: [PATCH -next] unicore32: Fix build error From: "Xuetao Guan" To: "Guenter Roeck" Cc: "Guan Xuetao" , "Qin Rui" , linux-kernel@vger.kernel.org, "Guenter Roeck" Reply-To: gxt@mprc.pku.edu.cn User-Agent: SquirrelMail/1.4.8-4.0.1.el5 MIME-Version: 1.0 Content-Type: text/plain;charset=gb2312 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1298 Lines: 38 > Since the oldabi syscall interface was first introduced, the > infrastructure > changed and the patch no longer compiles. See commit f56141e3e2d9a ("all > arches, signal: move restart_block to struct task_struct") for details. > > Fixes: 1ace5d1e3d4b4 ("unicore32-oldabi: add oldabi syscall interface") > Signed-off-by: Guenter Roeck Sorry, I missed your patch when sent patch-v2 for oldabi. And so, I directly modified the codes in patch-v2. I'll add your comment and Sob for patch-v2. Thanks, Guenter. Xuetao > --- > Should be merged with the commit introducing the problem if possible. > > arch/unicore32/kernel/signal.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/unicore32/kernel/signal.c > b/arch/unicore32/kernel/signal.c > index 78a66491b108..be75ef8c1e0c 100644 > --- a/arch/unicore32/kernel/signal.c > +++ b/arch/unicore32/kernel/signal.c > @@ -115,7 +115,7 @@ asmlinkage int __sys_sigreturn(struct pt_regs *regs) > struct 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, > -- > 2.5.0 >