Re: [PATCH] arch-independent syscalls to return long

[Robert Love]

On Fri, 2003-03-21 at 14:23, Robert Love wrote:

> I always that it did not matter, but Arjan just pointed out
> otherwise (as you saw).  So I guess these need to be reverted.

And here is a patch to do so.

This patch, against 2.5.65 + the previous two, replaces the missing
asmlinkage on prototypes.

	Robert Love

 drivers/message/fusion/mptctl.c |    3 ++-
 net/compat.c                    |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff -urN linux-2.5.65/drivers/message/fusion/mptctl.c linux/drivers/message/fusion/mptctl.c
--- linux-2.5.65/drivers/message/fusion/mptctl.c	2003-03-21 14:23:30.878772704 -0500
+++ linux/drivers/message/fusion/mptctl.c	2003-03-21 14:24:24.599605896 -0500
@@ -2743,7 +2743,8 @@
 						      unsigned long,
 						      struct file *));
 int unregister_ioctl32_conversion(unsigned int cmd);
-extern long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
+extern asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd,
+				 unsigned long arg);
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /* sparc32_XXX functions are used to provide a conversion between
diff -urN linux-2.5.65/net/compat.c linux/net/compat.c
--- linux-2.5.65/net/compat.c	2003-03-21 14:23:31.000000000 -0500
+++ linux/net/compat.c	2003-03-21 14:25:03.000000000 -0500
@@ -365,8 +365,8 @@
 	kmsg->msg_control = (void *) orig_cmsg_uptr;
 }
 
-extern long sys_setsockopt(int fd, int level, int optname,
-			   char *optval, int optlen);
+extern asmlinkage long sys_setsockopt(int fd, int level, int optname,
+				      char *optval, int optlen);
 
 static int do_netfilter_replace(int fd, int level, int optname,
 				char *optval, int optlen)