Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

arm64: Do not include asm/unistd32.h in asm/unistd.h

Browse source 
This patch only includes asm/unistd32.h where necessary and removes its
inclusion in the asm/unistd.h file. The __SYSCALL_COMPAT guard is
dropped.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Catalin Marinas 2012-10-10 15:27:04 +01:00
parent 4ed27ecfca
commit f3d447a97f
6 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/arm64/include/asm/unistd.h
View file

@ -14,12 +14,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __SYSCALL_COMPAT
#include <asm-generic/unistd.h>
#endif
#ifdef __KERNEL__
#ifdef CONFIG_COMPAT
#include <asm/unistd32.h>
#define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION
#define __ARCH_WANT_COMPAT_STAT64
#define __ARCH_WANT_SYS_GETHOSTNAME
#define __ARCH_WANT_SYS_PAUSE
#define __ARCH_WANT_SYS_GETPGRP
#define __ARCH_WANT_SYS_LLSEEK
#define __ARCH_WANT_SYS_NICE
#define __ARCH_WANT_SYS_SIGPENDING
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
#define __ARCH_WANT_COMPAT_SYS_SENDFILE
#endif
#endif

18
arch/arm64/include/asm/unistd32.h
View file

@ -21,8 +21,6 @@
#define __SYSCALL(x, y)
#endif
#ifdef __SYSCALL_COMPAT
__SYSCALL(0, sys_restart_syscall)
__SYSCALL(1, sys_exit)
__SYSCALL(2, compat_sys_fork_wrapper)
@ -414,19 +412,3 @@ __SYSCALL(373, sys_syncfs)
#define __ARM_NR_COMPAT_BASE 0x0f0000
#define __ARM_NR_compat_cacheflush (__ARM_NR_COMPAT_BASE+2)
#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE+5)
#endif /* __SYSCALL_COMPAT */
#define __NR_compat_syscalls 374
#define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION
#define __ARCH_WANT_COMPAT_STAT64
#define __ARCH_WANT_SYS_GETHOSTNAME
#define __ARCH_WANT_SYS_PAUSE
#define __ARCH_WANT_SYS_GETPGRP
#define __ARCH_WANT_SYS_LLSEEK
#define __ARCH_WANT_SYS_NICE
#define __ARCH_WANT_SYS_SIGPENDING
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
#define __ARCH_WANT_COMPAT_SYS_SENDFILE

1
arch/arm64/kernel/entry.S
View file

@ -26,6 +26,7 @@
#include <asm/errno.h>
#include <asm/thread_info.h>
#include <asm/unistd.h>
#include <asm/unistd32.h>
/*
* Bad Abort numbers

4
arch/arm64/kernel/signal32.c
View file

@ -18,8 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define __SYSCALL_COMPAT
#include <linux/compat.h>
#include <linux/signal.h>
#include <linux/syscalls.h>
@ -28,7 +26,7 @@
#include <asm/fpsimd.h>
#include <asm/signal32.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
#include <asm/unistd32.h>
struct compat_sigaction {
compat_uptr_t sa_handler;

3
arch/arm64/kernel/sys32.S
View file

@ -149,11 +149,10 @@ ENDPROC(compat_sys_fanotify_mark_wrapper)
#undef __SYSCALL
#define __SYSCALL(x, y) .quad y // x
#define __SYSCALL_COMPAT
/*
* The system calls table must be 4KB aligned.
*/
.align 12
ENTRY(compat_sys_call_table)
#include <asm/unistd.h>
#include <asm/unistd32.h>

4
arch/arm64/kernel/sys_compat.c
View file

@ -18,8 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define __SYSCALL_COMPAT
#include <linux/compat.h>
#include <linux/personality.h>
#include <linux/sched.h>
@ -28,7 +26,7 @@
#include <linux/uaccess.h>
#include <asm/cacheflush.h>
#include <asm/unistd.h>
#include <asm/unistd32.h>
asmlinkage int compat_sys_fork(struct pt_regs *regs)
{