[PATCH] Clean up sys_ioperm stubs

From: Brian Gerst <bgerst@didntduck.org>

Remove stubs for sys_ioperm for non-x86 arches, using sys_ni_syscall
instead where applicable.  Support for sys_ioperm is unconditionally no for
non-x86 arches.

diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c
index 001b7d9765f53a5d1976f56a2a8232178b9d2b57..0f61b7ad69abdea6661f411c1696cb3af7388424 100644 (file)
--- a/arch/h8300/kernel/sys_h8300.c
+++ b/arch/h8300/kernel/sys_h8300.c
@@ -260,11 +260,6 @@ asmlinkage int sys_ipc (uint call, int first, int second,
        return -EINVAL;
 }
 
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on)
-{
-  return -ENOSYS;
-}
-
 /* sys_cacheflush -- no support.  */
 asmlinkage int
 sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)

diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S
index e77bc055fb5a8356b1f4011b795ca3a63e3b52dd..6d1638078b133da8ed52aa05f6113843533b210d 100644 (file)
--- a/arch/h8300/kernel/syscalls.S
+++ b/arch/h8300/kernel/syscalls.S
@@ -116,7 +116,7 @@ SYMBOL_NAME_LABEL(sys_call_table)
        .long SYMBOL_NAME(sys_ni_syscall)                               /* old profil syscall holder */
        .long SYMBOL_NAME(sys_statfs)
        .long SYMBOL_NAME(sys_fstatfs)          /* 100 */
-       .long SYMBOL_NAME(sys_ioperm)
+       .long SYMBOL_NAME(sys_ni_syscall)       /* ioperm for i386 */
        .long SYMBOL_NAME(sys_socketcall)
        .long SYMBOL_NAME(sys_syslog)
        .long SYMBOL_NAME(sys_setitimer)

diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index c2078dc5b1cc6ac6f804e3529125220ff2ff0490..015e4632db01590e834982441923e76c755dbec7 100644 (file)
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -528,7 +528,7 @@ sys_call_table:
        .long sys_ni_syscall                            /* old profil syscall holder */
        .long sys_statfs
        .long sys_fstatfs       /* 100 */
-       .long sys_ioperm
+       .long sys_ni_syscall                            /* ioperm for i386 */
        .long sys_socketcall
        .long sys_syslog
        .long sys_setitimer

diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index ecad0657923d9f894ed58a4ab927e66d6bdde505..fb1f0c7fa5af711d2864f671a593f8aaaa6a41d6 100644 (file)
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -261,12 +261,6 @@ asmlinkage int sys_ipc (uint call, int first, int second,
        return -EINVAL;
 }
 
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on)
-{
-  return -ENOSYS;
-}
-
-
 /* Convert virtual (user) address VADDR to physical address PADDR */
 #define virt_to_phys_040(vaddr)                                                \
 ({                                                                     \

diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index e17711d097ebbb0d0a9f230a36eb0936248152dd..d87e1e0a1336d8aed5f6dffeeb61e75616d03870 100644 (file)
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -193,12 +193,6 @@ asmlinkage int sys_ipc (uint call, int first, int second,
        return -EINVAL;
 }
 
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on)
-{
-  return -ENOSYS;
-}
-
-
 /* sys_cacheflush -- flush (part of) the processor cache.  */
 asmlinkage int
 sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)

diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S
index 43f1413494fa4f961411890516df616fa5b18fd8..01a8c1d20197961ef1714b6d255df12f7f0454c0 100644 (file)
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
@@ -120,7 +120,7 @@ ENTRY(sys_call_table)
        .long sys_ni_syscall    /* old profil syscall holder */
        .long sys_statfs
        .long sys_fstatfs       /* 100 */
-       .long sys_ioperm
+       .long sys_ni_syscall    /* ioperm for i386 */
        .long sys_socketcall
        .long sys_syslog
        .long sys_setitimer

diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index 3868eca28e31eb9f9fc06dfa6e536ad44c3114d3..93cd4dcfa4702c76335e20219e42835a5fd90648 100644 (file)
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -242,14 +242,6 @@ asmlinkage ssize_t parisc_readahead(int fd, unsigned int high, unsigned int low,
        return sys_readahead(fd, (loff_t)high << 32 | low, count);
 }
 
-/*
- * This changes the io permissions bitmap in the current task.
- */
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
-{
-       return -ENOSYS;
-}
-
 asmlinkage unsigned long sys_alloc_hugepages(int key, unsigned long addr, unsigned long len, int prot, int flag)
 {
        return -ENOMEM;

diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 1ad6b5046d59eedb212d3b51413f5381c0e2f954..2135423ea8c073412c435b21bdcc6c4f2b531207 100644 (file)
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -289,11 +289,6 @@ asmlinkage int sys_olduname(struct oldold_utsname * name)
        return error;
 }
 
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on)
-{
-       return -ENOSYS;
-}
-
 #else /* CONFIG_ARCH_S390X */
 
 asmlinkage int s390x_newuname(struct new_utsname * name)

diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 2cb1ecad0bc90e5a6263c6d91c767adc19b38e56..cf39be13d622ae92b99df3a86caab13917eb18f2 100644 (file)
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -109,7 +109,7 @@ SYSCALL(sys_setpriority,sys_setpriority,sys32_setpriority_wrapper)
 NI_SYSCALL                                                     /* old profil syscall */
 SYSCALL(sys_statfs,sys_statfs,compat_sys_statfs_wrapper)
 SYSCALL(sys_fstatfs,sys_fstatfs,compat_sys_fstatfs_wrapper)    /* 100 */
-SYSCALL(sys_ioperm,sys_ni_syscall,sys_ni_syscall)
+NI_SYSCALL                                                     /* ioperm for i386 */
 SYSCALL(sys_socketcall,sys_socketcall,compat_sys_socketcall_wrapper)
 SYSCALL(sys_syslog,sys_syslog,sys32_syslog_wrapper)
 SYSCALL(sys_setitimer,sys_setitimer,compat_sys_setitimer_wrapper)

diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index b5ab596471d2cd193e5e3899c04d93c9939e37c4..152855146d117714e8f89c3d445014a4104067d5 100644 (file)
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -389,11 +389,6 @@ static int __init set_preferred_console(void)
 }
 console_initcall(set_preferred_console);
 
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on)
-{
-       return -EIO;
-}
-
 extern char *sparc_cpu_type[];
 extern char *sparc_fpu_type[];
 

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index bfdedb9f5618a9fa8a8b8fc86c8a7d28db294f2e..0da4309962ab146a33f90638f219f6e83f98e330 100644 (file)
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -603,11 +603,6 @@ static int __init set_preferred_console(void)
 }
 console_initcall(set_preferred_console);
 
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on)
-{
-       return -EIO;
-}
-
 /* BUFFER is PAGE_SIZE bytes long. */
 
 extern char *sparc_cpu_type;

diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 29c638023bf7cf20ba1d22f487fc87171527bd1a..d064b69d362383673596a1ff334acab82568a623 100644 (file)
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -282,11 +282,6 @@ static inline long put_tv32(struct compat_timeval *o, struct timeval *i)
                 __put_user(i->tv_usec, &o->tv_usec)));
 }
 
-asmlinkage long sys32_ioperm(u32 from, u32 num, int on)
-{
-       return sys_ioperm((unsigned long)from, (unsigned long)num, on);
-}
-
 struct msgbuf32 { s32 mtype; char mtext[1]; };
 
 struct ipc_perm32

diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h
index 882f4ede9e22ae89169c22c23c8dcca5edae6598..4f73d087e5d64d2cee68d14f215d99c3189dc56a 100644 (file)
--- a/include/asm-h8300/unistd.h
+++ b/include/asm-h8300/unistd.h
@@ -490,7 +490,6 @@ asmlinkage int sys_execve(char *name, char **argv, char **envp,
                        int dummy, ...);
 asmlinkage int sys_pipe(unsigned long *fildes);
 asmlinkage int sys_ptrace(long request, long pid, long addr, long data);
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 struct sigaction;
 asmlinkage long sys_rt_sigaction(int sig,
                                const struct sigaction __user *act,

diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h
index f48a11d05070de4ab1dc81358a00cf3bf789f1af..0cc0b9f40775442ec3178f9758fb6cae1909ffe8 100644 (file)
--- a/include/asm-m68k/unistd.h
+++ b/include/asm-m68k/unistd.h
@@ -374,7 +374,6 @@ asmlinkage long sys_mmap2(
 asmlinkage int sys_execve(char *name, char **argv, char **envp);
 asmlinkage int sys_pipe(unsigned long *fildes);
 asmlinkage int sys_ptrace(long request, long pid, long addr, long data);
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 struct pt_regs;
 struct sigaction;
 asmlinkage long sys_rt_sigaction(int sig,

diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h
index 347c65fcbd57c2c8d02490c47cb772ac3f7e8662..c58c9790c6066fad5fdb5beb9c3668b28a0ecc0c 100644 (file)
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
@@ -416,7 +416,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
 asmlinkage int sys_execve(char *name, char **argv, char **envp);
 asmlinkage int sys_pipe(unsigned long *fildes);
 asmlinkage int sys_ptrace(long request, long pid, long addr, long data);
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 struct pt_regs;
 int sys_request_irq(unsigned int,
                        irqreturn_t (*)(int, void *, struct pt_regs *),

diff --git a/include/asm-parisc/unistd.h b/include/asm-parisc/unistd.h
index 5e7dd4c201a6135b4b608f92fed883abdd4b78bd..d810f2ba5ff48f457d0011752704a3fb2e0d359f 100644 (file)
--- a/include/asm-parisc/unistd.h
+++ b/include/asm-parisc/unistd.h
@@ -909,7 +909,6 @@ int sys_clone(unsigned long clone_flags, unsigned long usp,
 int sys_vfork(struct pt_regs *regs);
 int sys_pipe(int *fildes);
 long sys_ptrace(long request, pid_t pid, long addr, long data);
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on);
 struct sigaction;
 asmlinkage long sys_rt_sigaction(int sig,
                                const struct sigaction __user *act,

diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index 0b364bd416ae3a28bfaf1a47c64d7fb774e2b30c..1d07e297d69c8ef32328d657a52aa0c188603055 100644 (file)
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -553,7 +553,6 @@ asmlinkage int sys_vfork(struct pt_regs regs);
 #endif /* CONFIG_ARCH_S390X */
 asmlinkage __SYS_RETTYPE sys_pipe(unsigned long *fildes);
 asmlinkage int sys_ptrace(long request, long pid, long addr, long data);
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 struct sigaction;
 asmlinkage long sys_rt_sigaction(int sig,
                                const struct sigaction __user *act,

diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index 99cec0555e182f7289c8087d49d91ae5fc8f113b..070bc905a7a115a15078a4765a178d05e26865d7 100644 (file)
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -447,7 +447,6 @@ asmlinkage unsigned long sys_mmap(
                                unsigned long addr, unsigned long len,
                                unsigned long prot, unsigned long flags,
                                unsigned long fd, unsigned long off);
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 struct sigaction;
 asmlinkage long sys_rt_sigaction(int sig,
                                const struct sigaction __user *act,