powerpc: kill pointless wrappers (a31dd96f) · Commits · e / devices / android_kernel_xiaomi_markw

arch/powerpc/include/asm/systbl.h

+31 −31

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ SYSCALL_SPU(read)
		SYSCALL_SPU(write)
		COMPAT_SYS_SPU(open)
		SYSCALL_SPU(close)
		COMPAT_SYS_SPU(waitpid)
		COMPAT_SYS_SPU(creat)
		SYSCALL_SPU(waitpid)
		SYSCALL_SPU(creat)
		SYSCALL_SPU(link)
		SYSCALL_SPU(unlink)
		COMPAT_SYS(execve)
		@@ -36,13 +36,13 @@ SYSCALL(pause)
		COMPAT_SYS(utime)
		SYSCALL(ni_syscall)
		SYSCALL(ni_syscall)
		COMPAT_SYS_SPU(access)
		COMPAT_SYS_SPU(nice)
		SYSCALL_SPU(access)
		SYSCALL_SPU(nice)
		SYSCALL(ni_syscall)
		SYSCALL_SPU(sync)
		COMPAT_SYS_SPU(kill)
		SYSCALL_SPU(kill)
		SYSCALL_SPU(rename)
		COMPAT_SYS_SPU(mkdir)
		SYSCALL_SPU(mkdir)
		SYSCALL_SPU(rmdir)
		SYSCALL_SPU(dup)
		SYSCALL_SPU(pipe)
		@@ -60,10 +60,10 @@ SYSCALL(ni_syscall)
		COMPAT_SYS_SPU(ioctl)
		COMPAT_SYS_SPU(fcntl)
		SYSCALL(ni_syscall)
		COMPAT_SYS_SPU(setpgid)
		SYSCALL_SPU(setpgid)
		SYSCALL(ni_syscall)
		SYSX(sys_ni_syscall,sys_olduname, sys_olduname)
		COMPAT_SYS_SPU(umask)
		SYSCALL_SPU(umask)
		SYSCALL_SPU(chroot)
		COMPAT_SYS(ustat)
		SYSCALL_SPU(dup2)
		@@ -72,24 +72,24 @@ SYSCALL_SPU(getpgrp)
		SYSCALL_SPU(setsid)
		SYS32ONLY(sigaction)
		SYSCALL_SPU(sgetmask)
		COMPAT_SYS_SPU(ssetmask)
		SYSCALL_SPU(ssetmask)
		SYSCALL_SPU(setreuid)
		SYSCALL_SPU(setregid)
		#define compat_sys_sigsuspend sys_sigsuspend
		SYS32ONLY(sigsuspend)
		COMPAT_SYS(sigpending)
		COMPAT_SYS_SPU(sethostname)
		SYSCALL_SPU(sethostname)
		COMPAT_SYS_SPU(setrlimit)
		COMPAT_SYS(old_getrlimit)
		COMPAT_SYS_SPU(getrusage)
		COMPAT_SYS_SPU(gettimeofday)
		COMPAT_SYS_SPU(settimeofday)
		COMPAT_SYS_SPU(getgroups)
		COMPAT_SYS_SPU(setgroups)
		SYSCALL_SPU(getgroups)
		SYSCALL_SPU(setgroups)
		SYSX(sys_ni_syscall,sys_ni_syscall,ppc_select)
		SYSCALL_SPU(symlink)
		OLDSYS(lstat)
		COMPAT_SYS_SPU(readlink)
		SYSCALL_SPU(readlink)
		SYSCALL(uselib)
		SYSCALL(swapon)
		SYSCALL(reboot)
		@@ -100,14 +100,14 @@ COMPAT_SYS_SPU(truncate)
		COMPAT_SYS_SPU(ftruncate)
		SYSCALL_SPU(fchmod)
		SYSCALL_SPU(fchown)
		COMPAT_SYS_SPU(getpriority)
		COMPAT_SYS_SPU(setpriority)
		SYSCALL_SPU(getpriority)
		SYSCALL_SPU(setpriority)
		SYSCALL(ni_syscall)
		COMPAT_SYS(statfs)
		COMPAT_SYS(fstatfs)
		SYSCALL(ni_syscall)
		COMPAT_SYS_SPU(socketcall)
		COMPAT_SYS_SPU(syslog)
		SYSCALL_SPU(syslog)
		COMPAT_SYS_SPU(setitimer)
		COMPAT_SYS_SPU(getitimer)
		COMPAT_SYS_SPU(newstat)
		@@ -125,7 +125,7 @@ COMPAT_SYS(ipc)
		SYSCALL_SPU(fsync)
		SYS32ONLY(sigreturn)
		PPC_SYS(clone)
		COMPAT_SYS_SPU(setdomainname)
		SYSCALL_SPU(setdomainname)
		SYSCALL_SPU(newuname)
		SYSCALL(ni_syscall)
		COMPAT_SYS_SPU(adjtimex)
		@@ -136,10 +136,10 @@ SYSCALL(init_module)
		SYSCALL(delete_module)
		SYSCALL(ni_syscall)
		SYSCALL(quotactl)
		COMPAT_SYS_SPU(getpgid)
		SYSCALL_SPU(getpgid)
		SYSCALL_SPU(fchdir)
		SYSCALL_SPU(bdflush)
		COMPAT_SYS(sysfs)
		SYSCALL_SPU(sysfs)
		SYSX_SPU(ppc64_personality,ppc64_personality,sys_personality)
		SYSCALL(ni_syscall)
		SYSCALL_SPU(setfsuid)
		@@ -151,21 +151,21 @@ SYSCALL_SPU(flock)
		SYSCALL_SPU(msync)
		COMPAT_SYS_SPU(readv)
		COMPAT_SYS_SPU(writev)
		COMPAT_SYS_SPU(getsid)
		SYSCALL_SPU(getsid)
		SYSCALL_SPU(fdatasync)
		COMPAT_SYS(sysctl)
		SYSCALL_SPU(mlock)
		SYSCALL_SPU(munlock)
		SYSCALL_SPU(mlockall)
		SYSCALL_SPU(munlockall)
		COMPAT_SYS_SPU(sched_setparam)
		COMPAT_SYS_SPU(sched_getparam)
		COMPAT_SYS_SPU(sched_setscheduler)
		COMPAT_SYS_SPU(sched_getscheduler)
		SYSCALL_SPU(sched_setparam)
		SYSCALL_SPU(sched_getparam)
		SYSCALL_SPU(sched_setscheduler)
		SYSCALL_SPU(sched_getscheduler)
		SYSCALL_SPU(sched_yield)
		COMPAT_SYS_SPU(sched_get_priority_max)
		COMPAT_SYS_SPU(sched_get_priority_min)
		SYSX_SPU(sys_sched_rr_get_interval,compat_sys_sched_rr_get_interval_wrapper,sys_sched_rr_get_interval)
		SYSCALL_SPU(sched_get_priority_max)
		SYSCALL_SPU(sched_get_priority_min)
		COMPAT_SYS_SPU(sched_rr_get_interval)
		COMPAT_SYS_SPU(nanosleep)
		SYSCALL_SPU(mremap)
		SYSCALL_SPU(setresuid)
		@@ -175,7 +175,7 @@ SYSCALL_SPU(poll)
		SYSCALL(ni_syscall)
		SYSCALL_SPU(setresgid)
		SYSCALL_SPU(getresgid)
		COMPAT_SYS_SPU(prctl)
		SYSCALL_SPU(prctl)
		COMPAT_SYS(rt_sigreturn)
		COMPAT_SYS(rt_sigaction)
		COMPAT_SYS(rt_sigprocmask)
		@@ -254,7 +254,7 @@ COMPAT_SYS_SPU(clock_gettime)
		COMPAT_SYS_SPU(clock_getres)
		COMPAT_SYS_SPU(clock_nanosleep)
		SYSX(ppc64_swapcontext,ppc32_swapcontext,ppc_swapcontext)
		COMPAT_SYS_SPU(tgkill)
		SYSCALL_SPU(tgkill)
		COMPAT_SYS_SPU(utimes)
		COMPAT_SYS_SPU(statfs64)
		COMPAT_SYS_SPU(fstatfs64)
		@@ -277,8 +277,8 @@ COMPAT_SYS(add_key)
		COMPAT_SYS(request_key)
		COMPAT_SYS(keyctl)
		COMPAT_SYS(waitid)
		COMPAT_SYS(ioprio_set)
		COMPAT_SYS(ioprio_get)
		SYSCALL(ioprio_set)
		SYSCALL(ioprio_get)
		SYSCALL(inotify_init)
		SYSCALL(inotify_add_watch)
		SYSCALL(inotify_rm_watch)

arch/powerpc/kernel/sys_ppc32.c

+0 −301

Original line number	Diff line number	Diff line
		@@ -61,16 +61,6 @@ asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,
		return compat_sys_select((int)n, inp, outp, exp, compat_ptr(tvp_x));
		}

		/* Note: it is necessary to treat option as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_sysfs(u32 option, u32 arg1, u32 arg2)
		{
		return sys_sysfs((int)option, arg1, arg2);
		}

		#ifdef CONFIG_SYSVIPC
		long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t ptr,
		u32 fifth)
		@@ -156,125 +146,6 @@ asmlinkage long compat_sys_sendfile64_wrapper(u32 out_fd, u32 in_fd,
		(off_t __user *)offset, count);
		}

		/* Note: it is necessary to treat option as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_prctl(u32 option, u32 arg2, u32 arg3, u32 arg4, u32 arg5)
		{
		return sys_prctl((int)option,
		(unsigned long) arg2,
		(unsigned long) arg3,
		(unsigned long) arg4,
		(unsigned long) arg5);
		}

		/* Note: it is necessary to treat pid as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_sched_rr_get_interval_wrapper(u32 pid,
		struct compat_timespec __user *interval)
		{
		return compat_sys_sched_rr_get_interval((int)pid, interval);
		}

		/* Note: it is necessary to treat mode as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_access(const char __user * filename, u32 mode)
		{
		return sys_access(filename, (int)mode);
		}


		/* Note: it is necessary to treat mode as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_creat(const char __user * pathname, u32 mode)
		{
		return sys_creat(pathname, (int)mode);
		}


		/* Note: it is necessary to treat pid and options as unsigned ints,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_waitpid(u32 pid, unsigned int __user * stat_addr, u32 options)
		{
		return sys_waitpid((int)pid, stat_addr, (int)options);
		}


		/* Note: it is necessary to treat gidsetsize as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_getgroups(u32 gidsetsize, gid_t __user *grouplist)
		{
		return sys_getgroups((int)gidsetsize, grouplist);
		}


		/* Note: it is necessary to treat pid as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_getpgid(u32 pid)
		{
		return sys_getpgid((int)pid);
		}



		/* Note: it is necessary to treat pid as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_getsid(u32 pid)
		{
		return sys_getsid((int)pid);
		}


		/* Note: it is necessary to treat pid and sig as unsigned ints,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_kill(u32 pid, u32 sig)
		{
		return sys_kill((int)pid, (int)sig);
		}


		/* Note: it is necessary to treat mode as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_mkdir(const char __user * pathname, u32 mode)
		{
		return sys_mkdir(pathname, (int)mode);
		}

		long compat_sys_nice(u32 increment)
		{
		/* sign extend increment */
		return sys_nice((int)increment);
		}

		off_t ppc32_lseek(unsigned int fd, u32 offset, unsigned int origin)
		{
		/* sign extend n */
		@@ -293,172 +164,6 @@ long compat_sys_ftruncate(int fd, u32 length)
		return sys_ftruncate(fd, (int)length);
		}

		/* Note: it is necessary to treat bufsiz as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_readlink(const char __user * path, char __user * buf, u32 bufsiz)
		{
		return sys_readlink(path, buf, (int)bufsiz);
		}

		/* Note: it is necessary to treat option as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_sched_get_priority_max(u32 policy)
		{
		return sys_sched_get_priority_max((int)policy);
		}


		/* Note: it is necessary to treat policy as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_sched_get_priority_min(u32 policy)
		{
		return sys_sched_get_priority_min((int)policy);
		}


		/* Note: it is necessary to treat pid as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_sched_getparam(u32 pid, struct sched_param __user *param)
		{
		return sys_sched_getparam((int)pid, param);
		}


		/* Note: it is necessary to treat pid as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_sched_getscheduler(u32 pid)
		{
		return sys_sched_getscheduler((int)pid);
		}


		/* Note: it is necessary to treat pid as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_sched_setparam(u32 pid, struct sched_param __user *param)
		{
		return sys_sched_setparam((int)pid, param);
		}


		/* Note: it is necessary to treat pid and policy as unsigned ints,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_sched_setscheduler(u32 pid, u32 policy, struct sched_param __user *param)
		{
		return sys_sched_setscheduler((int)pid, (int)policy, param);
		}


		/* Note: it is necessary to treat len as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_setdomainname(char __user *name, u32 len)
		{
		return sys_setdomainname(name, (int)len);
		}


		/* Note: it is necessary to treat gidsetsize as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_setgroups(u32 gidsetsize, gid_t __user *grouplist)
		{
		return sys_setgroups((int)gidsetsize, grouplist);
		}


		asmlinkage long compat_sys_sethostname(char __user *name, u32 len)
		{
		/* sign extend len */
		return sys_sethostname(name, (int)len);
		}


		/* Note: it is necessary to treat pid and pgid as unsigned ints,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_setpgid(u32 pid, u32 pgid)
		{
		return sys_setpgid((int)pid, (int)pgid);
		}

		long compat_sys_getpriority(u32 which, u32 who)
		{
		/* sign extend which and who */
		return sys_getpriority((int)which, (int)who);
		}

		long compat_sys_setpriority(u32 which, u32 who, u32 niceval)
		{
		/* sign extend which, who and niceval */
		return sys_setpriority((int)which, (int)who, (int)niceval);
		}

		long compat_sys_ioprio_get(u32 which, u32 who)
		{
		/* sign extend which and who */
		return sys_ioprio_get((int)which, (int)who);
		}

		long compat_sys_ioprio_set(u32 which, u32 who, u32 ioprio)
		{
		/* sign extend which, who and ioprio */
		return sys_ioprio_set((int)which, (int)who, (int)ioprio);
		}

		/* Note: it is necessary to treat newmask as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_ssetmask(u32 newmask)
		{
		return sys_ssetmask((int) newmask);
		}

		asmlinkage long compat_sys_syslog(u32 type, char __user * buf, u32 len)
		{
		/* sign extend len */
		return sys_syslog(type, buf, (int)len);
		}


		/* Note: it is necessary to treat mask as an unsigned int,
		* with the corresponding cast to a signed int to insure that the
		* proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
		* and the register representation of a signed int (msr in 64-bit mode) is performed.
		*/
		asmlinkage long compat_sys_umask(u32 mask)
		{
		return sys_umask((int)mask);
		}

		unsigned long compat_sys_mmap2(unsigned long addr, size_t len,
		unsigned long prot, unsigned long flags,
		unsigned long fd, unsigned long pgoff)
		@@ -467,12 +172,6 @@ unsigned long compat_sys_mmap2(unsigned long addr, size_t len,
		return sys_mmap(addr, len, prot, flags, fd, pgoff << 12);
		}

		long compat_sys_tgkill(u32 tgid, u32 pid, int sig)
		{
		/* sign extend tgid, pid */
		return sys_tgkill((int)tgid, (int)pid, sig);
		}

		/*
		* long long munging:
		* The 32 bit ABI passes long longs in an odd even register pair.