From 2be2f0aeafc9f8687a9239e8685b3e1e81cae120 Mon Sep 17 00:00:00 2001 From: David Mosberger Date: Wed, 31 Dec 2003 07:21:34 -0800 Subject: [PATCH] ia64: Remove the old ia64_ni_syscall()/sys32_ni_syscall() routines which are overly verbose and replace them with calls to sys_ni_syscall(). --- arch/ia64/ia32/ia32_entry.S | 64 ++++++++++++++++++------------------- arch/ia64/ia32/sys_ia32.c | 13 -------- arch/ia64/kernel/entry.S | 56 ++++++++++++++++---------------- arch/ia64/kernel/traps.c | 15 --------- 4 files changed, 60 insertions(+), 88 deletions(-) diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S index f8b22ce60ff2c..704f6687f5780 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S @@ -208,7 +208,7 @@ END(sys32_fork) .align 8 .globl ia32_syscall_table ia32_syscall_table: - data8 sys32_ni_syscall /* 0 - old "setup(" system call*/ + data8 sys_ni_syscall /* 0 - old "setup(" system call*/ data8 sys_exit data8 sys32_fork data8 sys_read @@ -225,25 +225,25 @@ ia32_syscall_table: data8 sys_mknod data8 sys_chmod /* 15 */ data8 sys_lchown /* 16-bit version */ - data8 sys32_ni_syscall /* old break syscall holder */ - data8 sys32_ni_syscall + data8 sys_ni_syscall /* old break syscall holder */ + data8 sys_ni_syscall data8 sys32_lseek data8 sys_getpid /* 20 */ data8 sys_mount data8 sys_oldumount data8 sys_setuid /* 16-bit version */ data8 sys_getuid /* 16-bit version */ - data8 sys32_ni_syscall /* sys_stime is not supported on IA64 */ /* 25 */ + data8 sys_ni_syscall /* sys_stime is not supported on IA64 */ /* 25 */ data8 sys32_ptrace data8 sys32_alarm - data8 sys32_ni_syscall + data8 sys_ni_syscall data8 sys32_pause data8 compat_sys_utime /* 30 */ - data8 sys32_ni_syscall /* old stty syscall holder */ - data8 sys32_ni_syscall /* old gtty syscall holder */ + data8 sys_ni_syscall /* old stty syscall holder */ + data8 sys_ni_syscall /* old gtty syscall holder */ data8 sys_access data8 sys_nice - data8 sys32_ni_syscall /* 35 */ /* old ftime syscall holder */ + data8 sys_ni_syscall /* 35 */ /* old ftime syscall holder */ data8 sys_sync data8 sys_kill data8 sys_rename @@ -252,7 +252,7 @@ ia32_syscall_table: data8 sys_dup data8 sys32_pipe data8 compat_sys_times - data8 sys32_ni_syscall /* old prof syscall holder */ + data8 sys_ni_syscall /* old prof syscall holder */ data8 sys32_brk /* 45 */ data8 sys_setgid /* 16-bit version */ data8 sys_getgid /* 16-bit version */ @@ -261,13 +261,13 @@ ia32_syscall_table: data8 sys_getegid /* 16-bit version */ /* 50 */ data8 sys_acct data8 sys_umount /* recycled never used phys( */ - data8 sys32_ni_syscall /* old lock syscall holder */ + data8 sys_ni_syscall /* old lock syscall holder */ data8 compat_sys_ioctl data8 compat_sys_fcntl /* 55 */ - data8 sys32_ni_syscall /* old mpx syscall holder */ + data8 sys_ni_syscall /* old mpx syscall holder */ data8 sys_setpgid - data8 sys32_ni_syscall /* old ulimit syscall holder */ - data8 sys32_ni_syscall + data8 sys_ni_syscall /* old ulimit syscall holder */ + data8 sys_ni_syscall data8 sys_umask /* 60 */ data8 sys_chroot data8 sys_ustat @@ -276,8 +276,8 @@ ia32_syscall_table: data8 sys_getpgrp /* 65 */ data8 sys_setsid data8 sys32_sigaction - data8 sys32_ni_syscall - data8 sys32_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall data8 sys_setreuid /* 16-bit version */ /* 70 */ data8 sys_setregid /* 16-bit version */ data8 sys32_sigsuspend @@ -292,7 +292,7 @@ ia32_syscall_table: data8 sys32_setgroups16 data8 sys32_old_select data8 sys_symlink - data8 sys32_ni_syscall + data8 sys_ni_syscall data8 sys_readlink /* 85 */ data8 sys_uselib data8 sys_swapon @@ -306,7 +306,7 @@ ia32_syscall_table: data8 sys_fchown /* 16-bit version */ /* 95 */ data8 sys_getpriority data8 sys_setpriority - data8 sys32_ni_syscall /* old profil syscall holder */ + data8 sys_ni_syscall /* old profil syscall holder */ data8 compat_sys_statfs data8 compat_sys_fstatfs /* 100 */ data8 sys32_ioperm @@ -317,11 +317,11 @@ ia32_syscall_table: data8 compat_sys_newstat data8 compat_sys_newlstat data8 compat_sys_newfstat - data8 sys32_ni_syscall + data8 sys_ni_syscall data8 sys32_iopl /* 110 */ data8 sys_vhangup - data8 sys32_ni_syscall /* used to be sys_idle */ - data8 sys32_ni_syscall + data8 sys_ni_syscall /* used to be sys_idle */ + data8 sys_ni_syscall data8 compat_sys_wait4 data8 sys_swapoff /* 115 */ data8 sys32_sysinfo @@ -332,20 +332,20 @@ ia32_syscall_table: data8 sys_setdomainname data8 sys32_newuname data8 sys32_modify_ldt - data8 sys32_ni_syscall /* adjtimex */ + data8 sys_ni_syscall /* adjtimex */ data8 sys32_mprotect /* 125 */ data8 compat_sys_sigprocmask - data8 sys32_ni_syscall /* create_module */ - data8 sys32_ni_syscall /* init_module */ - data8 sys32_ni_syscall /* delete_module */ - data8 sys32_ni_syscall /* get_kernel_syms */ /* 130 */ + data8 sys_ni_syscall /* create_module */ + data8 sys_ni_syscall /* init_module */ + data8 sys_ni_syscall /* delete_module */ + data8 sys_ni_syscall /* get_kernel_syms */ /* 130 */ data8 sys_quotactl data8 sys_getpgid data8 sys_fchdir - data8 sys32_ni_syscall /* sys_bdflush */ + data8 sys_ni_syscall /* sys_bdflush */ data8 sys_sysfs /* 135 */ data8 sys32_personality - data8 sys32_ni_syscall /* for afs_syscall */ + data8 sys_ni_syscall /* for afs_syscall */ data8 sys_setfsuid /* 16-bit version */ data8 sys_setfsgid /* 16-bit version */ data8 sys_llseek /* 140 */ @@ -374,10 +374,10 @@ ia32_syscall_table: data8 sys_mremap data8 sys_setresuid /* 16-bit version */ data8 sys32_getresuid16 /* 16-bit version */ /* 165 */ - data8 sys32_ni_syscall /* vm86 */ - data8 sys32_ni_syscall /* sys_query_module */ + data8 sys_ni_syscall /* vm86 */ + data8 sys_ni_syscall /* sys_query_module */ data8 sys_poll - data8 sys32_ni_syscall /* nfsservctl */ + data8 sys_ni_syscall /* nfsservctl */ data8 sys_setresgid /* 170 */ data8 sys32_getresgid16 data8 sys_prctl @@ -396,8 +396,8 @@ ia32_syscall_table: data8 sys_capset /* 185 */ data8 sys32_sigaltstack data8 sys32_sendfile - data8 sys32_ni_syscall /* streams1 */ - data8 sys32_ni_syscall /* streams2 */ + data8 sys_ni_syscall /* streams1 */ + data8 sys_ni_syscall /* streams2 */ data8 sys32_vfork /* 190 */ data8 compat_sys_getrlimit data8 sys32_mmap2 diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index eab062c6ef8a9..3c993365a8c91 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c @@ -2164,19 +2164,6 @@ sys32_ptrace (int request, pid_t pid, unsigned int addr, unsigned int data, return ret; } -asmlinkage long sys_ni_syscall(void); - -asmlinkage long -sys32_ni_syscall (int dummy0, int dummy1, int dummy2, int dummy3, int dummy4, int dummy5, - int dummy6, int dummy7, int stack) -{ - struct pt_regs *regs = (struct pt_regs *)&stack; - - printk(KERN_WARNING "IA32 syscall #%d issued, maybe we should implement it\n", - (int)regs->r1); - return(sys_ni_syscall()); -} - /* * The IA64 maps 4 I/O ports for each 4K page */ diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 27943979a9c14..fb0ad0a27a7d1 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1329,9 +1329,9 @@ sys_call_table: data8 sys_syslog data8 sys_setitimer data8 sys_getitimer - data8 ia64_ni_syscall // 1120 /* was: ia64_oldstat */ - data8 ia64_ni_syscall /* was: ia64_oldlstat */ - data8 ia64_ni_syscall /* was: ia64_oldfstat */ + data8 sys_ni_syscall // 1120 /* was: ia64_oldstat */ + data8 sys_ni_syscall /* was: ia64_oldlstat */ + data8 sys_ni_syscall /* was: ia64_oldfstat */ data8 sys_vhangup data8 sys_lchown data8 sys_remap_file_pages // 1125 @@ -1341,16 +1341,16 @@ sys_call_table: data8 sys_setdomainname data8 sys_newuname // 1130 data8 sys_adjtimex - data8 ia64_ni_syscall /* was: ia64_create_module */ + data8 sys_ni_syscall /* was: ia64_create_module */ data8 sys_init_module data8 sys_delete_module - data8 ia64_ni_syscall // 1135 /* was: sys_get_kernel_syms */ - data8 ia64_ni_syscall /* was: sys_query_module */ + data8 sys_ni_syscall // 1135 /* was: sys_get_kernel_syms */ + data8 sys_ni_syscall /* was: sys_query_module */ data8 sys_quotactl data8 sys_bdflush data8 sys_sysfs data8 sys_personality // 1140 - data8 ia64_ni_syscall // sys_afs_syscall + data8 sys_ni_syscall // sys_afs_syscall data8 sys_setfsuid data8 sys_setfsgid data8 sys_getdents @@ -1468,26 +1468,26 @@ sys_call_table: data8 sys_clock_nanosleep data8 sys_fstatfs64 data8 sys_statfs64 - data8 ia64_ni_syscall - data8 ia64_ni_syscall // 1260 - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall // 1265 - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall // 1270 - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall // 1275 - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall - data8 ia64_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall // 1260 + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall // 1265 + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall // 1270 + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall // 1275 + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall + data8 sys_ni_syscall .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index f46270401f3c5..0db770ff9183a 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c @@ -215,21 +215,6 @@ ia64_bad_break (unsigned long break_num, struct pt_regs *regs) force_sig_info(sig, &siginfo, current); } -/* - * Unimplemented system calls. This is called only for stuff that - * we're supposed to implement but haven't done so yet. Everything - * else goes to sys_ni_syscall. - * - * XXX Remove this for v2.6.1. - */ -asmlinkage long -ia64_ni_syscall (unsigned long arg0, unsigned long arg1, unsigned long arg2, unsigned long arg3, - unsigned long arg4, unsigned long arg5, unsigned long arg6, unsigned long arg7, - unsigned long stack) -{ - return -ENOSYS; -} - /* * disabled_fph_fault() is called when a user-level process attempts to access f32..f127 * and it doesn't own the fp-high register partition. When this happens, we save the -- 2.53.0