Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758552AbcJRHYz (ORCPT ); Tue, 18 Oct 2016 03:24:55 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:51877 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963AbcJRHYr (ORCPT ); Tue, 18 Oct 2016 03:24:47 -0400 From: Guenter Roeck To: Guan Xuetao Cc: Qin Rui , linux-kernel@vger.kernel.org, Guenter Roeck Subject: [PATCH -next] unicore32: Fix build error Date: Tue, 18 Oct 2016 00:24:36 -0700 Message-Id: <1476775476-17024-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.5.0 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1066 Lines: 27 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 --- 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