From: chrisw@osdl.org <chrisw@osdl.org>
Date: Tue, 12 Apr 2005 21:08:20 +0000 (-0700)
Subject: [PATCH] add 01-uml-fix-nfsd-syscall-when-nfsd-modular.patch
X-Git-Tag: v2.6.11.9~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=978962aeba06cfb521f287b99edfd44e70ba4b9f;p=thirdparty%2Fkernel%2Fstable-queue.git

[PATCH] add 01-uml-fix-nfsd-syscall-when-nfsd-modular.patch
---

diff --git a/queue/01-uml-fix-nfsd-syscall-when-nfsd-modular.patch b/queue/01-uml-fix-nfsd-syscall-when-nfsd-modular.patch
new file mode 100644
index 00000000000..bdff3bff139
--- /dev/null
+++ b/queue/01-uml-fix-nfsd-syscall-when-nfsd-modular.patch
@@ -0,0 +1,50 @@
+From stable-bounces@linux.kernel.org  Tue Apr 12 10:45:24 2005
+To: akpm@osdl.org
+From: blaisorblade@yahoo.it
+Date: Tue, 12 Apr 2005 19:52:08 +0200
+Cc: blaisorblade@yahoo.it, linux-kernel@vger.kernel.org,
+        user-mode-linux-devel@lists.sourceforge.net, stable@kernel.org
+Subject: [patch] uml: add nfsd syscall when nfsd is modular
+
+CC: <stable@kernel.org>
+
+This trick is useless, because sys_ni.c will handle this problem by itself,
+like it does even on UML for other syscalls.
+Also, it does not provide the NFSD syscall when NFSD is compiled as a module,
+which is a big problem.
+
+This should be merged currently in both 2.6.11-stable and the current tree.
+
+Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+
+ clean-linux-2.6.11-paolo/arch/um/kernel/sys_call_table.c |    8 +-------
+ 1 files changed, 1 insertion(+), 7 deletions(-)
+
+diff -puN arch/um/kernel/sys_call_table.c~uml-nfsd-syscall arch/um/kernel/sys_call_table.c
+--- clean-linux-2.6.11/arch/um/kernel/sys_call_table.c~uml-nfsd-syscall	2005-04-10 13:50:29.000000000 +0200
++++ clean-linux-2.6.11-paolo/arch/um/kernel/sys_call_table.c	2005-04-10 13:51:19.000000000 +0200
+@@ -14,12 +14,6 @@
+ #include "sysdep/syscalls.h"
+ #include "kern_util.h"
+ 
+-#ifdef CONFIG_NFSD
+-#define NFSSERVCTL sys_nfsservctl
+-#else
+-#define NFSSERVCTL sys_ni_syscall
+-#endif
+-
+ #define LAST_GENERIC_SYSCALL __NR_keyctl
+ 
+ #if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
+@@ -190,7 +184,7 @@ syscall_handler_t *sys_call_table[] = {
+ 	[ __NR_getresuid ] = (syscall_handler_t *) sys_getresuid16,
+ 	[ __NR_query_module ] = (syscall_handler_t *) sys_ni_syscall,
+ 	[ __NR_poll ] = (syscall_handler_t *) sys_poll,
+-	[ __NR_nfsservctl ] = (syscall_handler_t *) NFSSERVCTL,
++	[ __NR_nfsservctl ] = (syscall_handler_t *) sys_nfsservctl,
+ 	[ __NR_setresgid ] = (syscall_handler_t *) sys_setresgid16,
+ 	[ __NR_getresgid ] = (syscall_handler_t *) sys_getresgid16,
+ 	[ __NR_prctl ] = (syscall_handler_t *) sys_prctl,
+_