From 6ada8a9c2f021fd071948431b4e0ca051fd8721e Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 22 Mar 2003 07:35:43 -0800 Subject: [PATCH] More syscalls-returning-long From: Robert Love Additional work to make syscalls return longs. --- Documentation/DocBook/kernel-hacking.tmpl | 2 +- drivers/macintosh/via-pmu.c | 2 +- drivers/message/fusion/mptctl.c | 3 ++- include/asm-parisc/unistd.h | 10 +++++----- include/linux/ioctl32.h | 2 +- kernel/suspend.c | 2 +- net/compat.c | 6 +++--- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl index 4ddb5ab9e3f8..f202622aedf5 100644 --- a/Documentation/DocBook/kernel-hacking.tmpl +++ b/Documentation/DocBook/kernel-hacking.tmpl @@ -319,7 +319,7 @@ -asmlinkage int sys_mycall(int arg) +asmlinkage long sys_mycall(int arg) { return 0; } diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 29e6a55bc17d..e737f4f77bee 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -1878,7 +1878,7 @@ restore_via_state(void) out_8(&via[IER], IER_SET | SR_INT | CB1_INT); } -extern int sys_sync(void); +extern long sys_sync(void); #define GRACKLE_PM (1<<7) #define GRACKLE_DOZE (1<<5) diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 95c19c511931..139ba6351540 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c @@ -2743,7 +2743,8 @@ extern int register_ioctl32_conversion(unsigned int cmd, unsigned long, struct file *)); int unregister_ioctl32_conversion(unsigned int cmd); -extern asmlinkage int 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 --git a/include/asm-parisc/unistd.h b/include/asm-parisc/unistd.h index dc8979b6eb2b..9aa3ef58c78b 100644 --- a/include/asm-parisc/unistd.h +++ b/include/asm-parisc/unistd.h @@ -842,19 +842,19 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 static inline pid_t setsid(void) { - extern int sys_setsid(void); + extern long sys_setsid(void); return sys_setsid(); } static inline int write(int fd, const char *buf, off_t count) { - extern int sys_write(int, const char *, int); + extern long sys_write(int, const char *, int); return sys_write(fd, buf, count); } static inline int read(int fd, char *buf, off_t count) { - extern int sys_read(int, char *, int); + extern long sys_read(int, char *, int); return sys_read(fd, buf, count); } @@ -866,7 +866,7 @@ static inline off_t lseek(int fd, off_t offset, int count) static inline int dup(int fd) { - extern int sys_dup(int); + extern long sys_dup(int); return sys_dup(fd); } @@ -891,7 +891,7 @@ static inline int close(int fd) static inline int _exit(int exitcode) { - extern int sys_exit(int) __attribute__((noreturn)); + extern long sys_exit(int) __attribute__((noreturn)); return sys_exit(exitcode); } diff --git a/include/linux/ioctl32.h b/include/linux/ioctl32.h index b7abfe6eae10..456494591a51 100644 --- a/include/linux/ioctl32.h +++ b/include/linux/ioctl32.h @@ -3,7 +3,7 @@ struct file; -int sys_ioctl(unsigned int, unsigned int, unsigned long); +extern long sys_ioctl(unsigned int, unsigned int, unsigned long); /* * Register an 32bit ioctl translation handler for ioctl cmd. diff --git a/kernel/suspend.c b/kernel/suspend.c index 44c9fda3ca76..f8b76113ecd2 100644 --- a/kernel/suspend.c +++ b/kernel/suspend.c @@ -65,7 +65,7 @@ #include #include -extern int sys_sync(void); +extern long sys_sync(void); unsigned char software_suspend_enabled = 0; diff --git a/net/compat.c b/net/compat.c index c4a9189c6994..45a4970b798f 100644 --- a/net/compat.c +++ b/net/compat.c @@ -365,8 +365,8 @@ fail: kmsg->msg_control = (void *) orig_cmsg_uptr; } -extern asmlinkage int 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) @@ -530,7 +530,7 @@ static int do_set_sock_timeout(int fd, int level, int optname, char *optval, int return err; } -asmlinkage int compat_sys_setsockopt(int fd, int level, int optname, +asmlinkage long compat_sys_setsockopt(int fd, int level, int optname, char *optval, int optlen) { if (optname == IPT_SO_SET_REPLACE) -- cgit v1.2.3