Commit 68f79793 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent ef6574ff
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
......@@ -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) \
({ \
......
......@@ -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)
......
......@@ -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
......
......@@ -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;
......
......@@ -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)
......
......@@ -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)
......
......@@ -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[];
......
......@@ -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;
......
......@@ -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
......
......@@ -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,
......
......@@ -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,
......
......@@ -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 *),
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
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