From patchwork Mon Aug 29 22:32:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1111032 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7TMWR2S016297 for ; Mon, 29 Aug 2011 22:32:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755173Ab1H2Wc0 (ORCPT ); Mon, 29 Aug 2011 18:32:26 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:58298 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754724Ab1H2WcZ (ORCPT ); Mon, 29 Aug 2011 18:32:25 -0400 Received: from canb.auug.org.au (ash.rothwell.emu.id.au [IPv6:2402:b800:7003:7010:223:14ff:fe30:c8e4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtps.tip.net.au (Postfix) with ESMTPSA id 3E3CA368002; Tue, 30 Aug 2011 08:32:19 +1000 (EST) Date: Tue, 30 Aug 2011 08:32:18 +1000 From: Stephen Rothwell To: Linus Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, NeilBrown , linuxppc-dev@lists.ozlabs.org, linux-parisc@vger.kernel.org, "J. Bruce Fields" Subject: Re: linux-next: build failure in Linus' tree Message-Id: <20110830083218.1819a5d73c3a33e5053e8312@canb.auug.org.au> In-Reply-To: <20110829104451.1c777e24ff72823d1e399f12@canb.auug.org.au> References: <20110829104451.1c777e24ff72823d1e399f12@canb.auug.org.au> X-Mailer: Sylpheed 3.2.0beta2 (GTK+ 2.24.5; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 29 Aug 2011 22:32:27 +0000 (UTC) Hi Linus, On Mon, 29 Aug 2011 10:44:51 +1000 Stephen Rothwell wrote: > > After merging the fixes tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > arch/powerpc/kernel/built-in.o: In function `.sys_call_table': > (.text+0xbd00): undefined reference to `.sys_nfsservctl' > arch/powerpc/kernel/built-in.o: In function `.sys_call_table': > (.text+0xbd08): undefined reference to `.compat_sys_nfsservctl' > > Caused by commit f5b940997397 ("All Arch: remove linkage for > sys_nfsservctl system call") which also missed parisc. > > I will apply this patch for today: Will you please appply this? (repeated for ease of inclusion) From: Stephen Rothwell Date: Mon, 29 Aug 2011 10:38:57 +1000 Subject: [PATCH] remove remaining references to nfsservctl These were missed in commit f5b940997397 "All Arch: remove linkage for sys_nfsservctl system call" due to them having no sys_ prefix (presumably). Cc: NeilBrown Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-parisc@vger.kernel.org Signed-off-by: Stephen Rothwell --- arch/parisc/kernel/syscall_table.S | 2 +- arch/powerpc/include/asm/systbl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index e66366f..3735abd 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -259,7 +259,7 @@ ENTRY_SAME(ni_syscall) /* query_module */ ENTRY_SAME(poll) /* structs contain pointers and an in_addr... */ - ENTRY_COMP(nfsservctl) + ENTRY_SAME(ni_syscall) /* was nfsservctl */ ENTRY_SAME(setresgid) /* 170 */ ENTRY_SAME(getresgid) ENTRY_SAME(prctl) diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index f6736b7..fa0d27a 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h @@ -171,7 +171,7 @@ SYSCALL_SPU(setresuid) SYSCALL_SPU(getresuid) SYSCALL(ni_syscall) SYSCALL_SPU(poll) -COMPAT_SYS(nfsservctl) +SYSCALL(ni_syscall) SYSCALL_SPU(setresgid) SYSCALL_SPU(getresgid) COMPAT_SYS_SPU(prctl)