Commit 6ada8a9c authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller

[PATCH] More syscalls-returning-long

From: Robert Love <rml@tech9.net>

Additional work to make syscalls return longs.
parent cf59843b
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
</para> </para>
<programlisting> <programlisting>
asmlinkage int sys_mycall(int arg) asmlinkage long sys_mycall(int arg)
{ {
return 0; return 0;
} }
......
...@@ -1878,7 +1878,7 @@ restore_via_state(void) ...@@ -1878,7 +1878,7 @@ restore_via_state(void)
out_8(&via[IER], IER_SET | SR_INT | CB1_INT); 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_PM (1<<7)
#define GRACKLE_DOZE (1<<5) #define GRACKLE_DOZE (1<<5)
......
...@@ -2743,7 +2743,8 @@ extern int register_ioctl32_conversion(unsigned int cmd, ...@@ -2743,7 +2743,8 @@ extern int register_ioctl32_conversion(unsigned int cmd,
unsigned long, unsigned long,
struct file *)); struct file *));
int unregister_ioctl32_conversion(unsigned int cmd); 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 /* sparc32_XXX functions are used to provide a conversion between
......
...@@ -842,19 +842,19 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 ...@@ -842,19 +842,19 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6
static inline pid_t setsid(void) static inline pid_t setsid(void)
{ {
extern int sys_setsid(void); extern long sys_setsid(void);
return sys_setsid(); return sys_setsid();
} }
static inline int write(int fd, const char *buf, off_t count) 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); return sys_write(fd, buf, count);
} }
static inline int read(int fd, char *buf, off_t 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); return sys_read(fd, buf, count);
} }
...@@ -866,7 +866,7 @@ static inline off_t lseek(int fd, off_t offset, int count) ...@@ -866,7 +866,7 @@ static inline off_t lseek(int fd, off_t offset, int count)
static inline int dup(int fd) static inline int dup(int fd)
{ {
extern int sys_dup(int); extern long sys_dup(int);
return sys_dup(fd); return sys_dup(fd);
} }
...@@ -891,7 +891,7 @@ static inline int close(int fd) ...@@ -891,7 +891,7 @@ static inline int close(int fd)
static inline int _exit(int exitcode) static inline int _exit(int exitcode)
{ {
extern int sys_exit(int) __attribute__((noreturn)); extern long sys_exit(int) __attribute__((noreturn));
return sys_exit(exitcode); return sys_exit(exitcode);
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
struct file; 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. * Register an 32bit ioctl translation handler for ioctl cmd.
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/io.h> #include <asm/io.h>
extern int sys_sync(void); extern long sys_sync(void);
unsigned char software_suspend_enabled = 0; unsigned char software_suspend_enabled = 0;
......
...@@ -365,7 +365,7 @@ void cmsg_compat_recvmsg_fixup(struct msghdr *kmsg, unsigned long orig_cmsg_uptr ...@@ -365,7 +365,7 @@ void cmsg_compat_recvmsg_fixup(struct msghdr *kmsg, unsigned long orig_cmsg_uptr
kmsg->msg_control = (void *) orig_cmsg_uptr; kmsg->msg_control = (void *) orig_cmsg_uptr;
} }
extern asmlinkage int sys_setsockopt(int fd, int level, int optname, extern asmlinkage long sys_setsockopt(int fd, int level, int optname,
char *optval, int optlen); char *optval, int optlen);
static int do_netfilter_replace(int fd, int level, int optname, static int do_netfilter_replace(int fd, int level, int optname,
...@@ -530,7 +530,7 @@ static int do_set_sock_timeout(int fd, int level, int optname, char *optval, int ...@@ -530,7 +530,7 @@ static int do_set_sock_timeout(int fd, int level, int optname, char *optval, int
return err; 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) char *optval, int optlen)
{ {
if (optname == IPT_SO_SET_REPLACE) if (optname == IPT_SO_SET_REPLACE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment