From patchwork Mon Aug 29 00:44:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 111956 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 2611BB6FA0 for ; Mon, 29 Aug 2011 10:45:04 +1000 (EST) Received: from smtps.tip.net.au (chilli.tip.net.au [IPv6:2402:b800:7003:1::44]) by ozlabs.org (Postfix) with ESMTP id 923AEB6F83 for ; Mon, 29 Aug 2011 10:44:55 +1000 (EST) Received: from canb.auug.org.au (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtps.tip.net.au (Postfix) with ESMTPSA id 97D0A144C1F; Mon, 29 Aug 2011 10:44:51 +1000 (EST) Date: Mon, 29 Aug 2011 10:44:51 +1000 From: Stephen Rothwell To: Linus Subject: linux-next: build failure in Linus' tree Message-Id: <20110829104451.1c777e24ff72823d1e399f12@canb.auug.org.au> X-Mailer: Sylpheed 3.2.0beta2 (GTK+ 2.24.5; i486-pc-linux-gnu) Mime-Version: 1.0 Cc: "J. Bruce Fields" , linux-parisc@vger.kernel.org, NeilBrown , linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Hi Linus, 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: 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)