[PATCH] xtensa: remove old syscalls

xtensa is now in -rc1, with the obsolete syscalls still in there, so I
guess this about the last chance to correct the ABI.  Applying the patch
obviously breaks all sorts of user space binaries and probably also
requires the appropriate changes to be made to libc.

On the other hand, if a decision is made to keep the broken interface, it
should at least be a conscious one instead of an oversight.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 0 insertions, 98 deletions

diff --git a/include/asm-xtensa/unistd.h b/include/asm-xtensa/unistd.h
index 64c64dd83ba4..6b39d6609d9c 100644
--- a/include/asm-xtensa/unistd.h
+++ b/include/asm-xtensa/unistd.h
@@ -13,42 +13,31 @@
 
 #include <linux/linkage.h>
 
-//#define __NR_setup              0 /* used only by init, to get system going */
 #define __NR_spill                0
 #define __NR_exit                 1
-#define __NR_fork                 2
 #define __NR_read                 3
 #define __NR_write                4
 #define __NR_open                 5
 #define __NR_close                6
-#define __NR_waitpid              7
 #define __NR_creat                8
 #define __NR_link                 9
 #define __NR_unlink              10
 #define __NR_execve              11
 #define __NR_chdir               12
-#define __NR_time                13
 #define __NR_mknod               14
 #define __NR_chmod               15
 #define __NR_lchown              16
 #define __NR_break               17
-#define __NR_oldstat             18
 #define __NR_lseek               19
 #define __NR_getpid              20
 #define __NR_mount               21
-#define __NR_oldumount           22
 #define __NR_setuid              23
 #define __NR_getuid              24
-#define __NR_stime               25
 #define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
 #define __NR_utime               30
 #define __NR_stty                31
 #define __NR_gtty                32
 #define __NR_access              33
-#define __NR_nice                34
 #define __NR_ftime               35
 #define __NR_sync                36
 #define __NR_kill                37
@@ -66,24 +55,18 @@
 #define __NR_geteuid             49
 #define __NR_getegid             50
 #define __NR_acct                51
-#define __NR_umount              52
 #define __NR_lock                53
 #define __NR_ioctl               54
 #define __NR_fcntl               55
-#define __NR_mpx                 56
 #define __NR_setpgid             57
 #define __NR_ulimit              58
-#define __NR_oldolduname         59
 #define __NR_umask               60
 #define __NR_chroot              61
 #define __NR_ustat               62
 #define __NR_dup2                63
 #define __NR_getppid             64
-#define __NR_getpgrp             65
 #define __NR_setsid              66
 #define __NR_sigaction           67
-#define __NR_sgetmask            68
-#define __NR_ssetmask            69
 #define __NR_setreuid            70
 #define __NR_setregid            71
 #define __NR_sigsuspend          72
@@ -98,13 +81,10 @@
 #define __NR_setgroups           81
 #define __NR_select              82
 #define __NR_symlink             83
-#define __NR_oldlstat            84
 #define __NR_readlink            85
 #define __NR_uselib              86
 #define __NR_swapon              87
 #define __NR_reboot              88
-#define __NR_readdir             89
-#define __NR_mmap                90
 #define __NR_munmap              91
 #define __NR_truncate            92
 #define __NR_ftruncate           93
@@ -116,22 +96,18 @@
 #define __NR_statfs              99
 #define __NR_fstatfs            100
 #define __NR_ioperm             101
-#define __NR_socketcall         102
 #define __NR_syslog             103
 #define __NR_setitimer          104
 #define __NR_getitimer          105
 #define __NR_stat               106
 #define __NR_lstat              107
 #define __NR_fstat              108
-#define __NR_olduname           109
 #define __NR_iopl               110
 #define __NR_vhangup            111
 #define __NR_idle               112
-#define __NR_vm86               113
 #define __NR_wait4              114
 #define __NR_swapoff            115
 #define __NR_sysinfo            116
-#define __NR_ipc                117
 #define __NR_fsync              118
 #define __NR_sigreturn          119
 #define __NR_clone              120
@@ -140,18 +116,15 @@
 #define __NR_modify_ldt         123
 #define __NR_adjtimex           124
 #define __NR_mprotect           125
-#define __NR_sigprocmask        126
 #define __NR_create_module      127
 #define __NR_init_module        128
 #define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
 #define __NR_quotactl           131
 #define __NR_getpgid            132
 #define __NR_fchdir             133
 #define __NR_bdflush            134
 #define __NR_sysfs              135
 #define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
 #define __NR_setfsuid           138
 #define __NR_setfsgid           139
 #define __NR__llseek            140
@@ -222,8 +195,6 @@
 #define __NR_capset             205
 #define __NR_sigaltstack        206
 #define __NR_sendfile           207
-#define __NR_streams1           208     /* some people actually want it */
-#define __NR_streams2           209     /* some people actually want it */
 #define __NR_mmap2              210
 #define __NR_truncate64         211
 #define __NR_ftruncate64        212
@@ -234,7 +205,6 @@
 #define __NR_mincore            217
 #define __NR_madvise            218
 #define __NR_getdents64         219
-#define __NR_vfork              220
 
 /* Keep this last; should always equal the last valid call number. */
 #define __NR_Linux_syscalls     220
@@ -448,55 +418,7 @@ __syscall_return(type,__res); \
 
 
 #ifdef __KERNEL_SYSCALLS__
-
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <linux/syscalls.h>
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-
-#define __NR__exit __NR_exit
-
-static __inline__ _syscall0(int,pause)
-//static __inline__ _syscall1(int,setup,int,magic) FIXME
-static __inline__ _syscall0(int,sync)
-static __inline__ _syscall0(pid_t,setsid)
-static __inline__ _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static __inline__ _syscall3(int,read,int,fd,char *,buf,off_t,count)
-static __inline__ _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
-static __inline__ _syscall1(int,dup,int,fd)
 static __inline__ _syscall3(int,execve,const char*,file,char**,argv,char**,envp)
-static __inline__ _syscall3(int,open,const char *,file,int,flag,int,mode)
-static __inline__ _syscall1(int,close,int,fd)
-static __inline__ _syscall1(int,_exit,int,exitcode)
-static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-static __inline__ _syscall1(int,delete_module,const char *,name)
-
-struct stat;
-static __inline__ _syscall2(int,fstat,int,fd,struct stat *,buf)
-static __inline__ _syscall0(pid_t,getpid)
-static __inline__ _syscall2(int,kill,int,pid,int,sig)
-static __inline__ _syscall2(int,stat,const char *, path,struct stat *,buf)
-static __inline__ _syscall1(int,unlink,char *,pathname)
-
-
-
-extern pid_t waitpid(int, int*, int );
-static __inline__ pid_t wait(int * wait_stat)
-{
-        return waitpid(-1,wait_stat,0);
-}
 #endif
 
 /*
@@ -508,30 +430,10 @@ static __inline__ pid_t wait(int * wait_stat)
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
 #ifdef __KERNEL__
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_OLD_STAT
 #define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_SGETMASK
-#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
 #define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
 #define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #endif
 
-
-
 #endif  /* _XTENSA_UNISTD_H */