leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: Remove unused definitions from asm/unistd32.h

Browse Source 
This patch removes the compat __NR_* definitions from the unistd32.h
file and only keeps those that are used by the AArch64 kernel with a new
__NR_compat_* prefix. The additional wrapper definitions in
arch/arm64/kernel/sys32.S have been removed and the actual wrapper names
included in the asm/unistd32.h file.

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:16:13 +01:00
parent 12250d843e
commit 4ed27ecfca
3 changed files with 394 additions and 840 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1093
arch/arm64/include/asm/unistd32.h
View File

File diff suppressed because it is too large Load Diff

18
arch/arm64/kernel/signal32.c
View File

@ -126,19 +126,19 @@ struct compat_rt_sigframe {
* For ARM syscalls, the syscall number has to be loaded into r7.
* We do not support an OABI userspace.
*/
#define MOV_R7_NR_SIGRETURN (0xe3a07000 | __NR_sigreturn)
#define SVC_SYS_SIGRETURN (0xef000000 | __NR_sigreturn)
#define MOV_R7_NR_RT_SIGRETURN (0xe3a07000 | __NR_rt_sigreturn)
#define SVC_SYS_RT_SIGRETURN (0xef000000 | __NR_rt_sigreturn)
#define MOV_R7_NR_SIGRETURN (0xe3a07000 | __NR_compat_sigreturn)
#define SVC_SYS_SIGRETURN (0xef000000 | __NR_compat_sigreturn)
#define MOV_R7_NR_RT_SIGRETURN (0xe3a07000 | __NR_compat_rt_sigreturn)
#define SVC_SYS_RT_SIGRETURN (0xef000000 | __NR_compat_rt_sigreturn)
/*
* For Thumb syscalls, we also pass the syscall number via r7. We therefore
* need two 16-bit instructions.
*/
#define SVC_THUMB_SIGRETURN (((0xdf00 | __NR_sigreturn) << 16) | \
0x2700 | __NR_sigreturn)
#define SVC_THUMB_RT_SIGRETURN (((0xdf00 | __NR_rt_sigreturn) << 16) | \
0x2700 | __NR_rt_sigreturn)
#define SVC_THUMB_SIGRETURN (((0xdf00 | __NR_compat_sigreturn) << 16) | \
0x2700 | __NR_compat_sigreturn)
#define SVC_THUMB_RT_SIGRETURN (((0xdf00 | __NR_compat_rt_sigreturn) << 16) | \
0x2700 | __NR_compat_rt_sigreturn)
const compat_ulong_t aarch32_sigret_code[6] = {
/*
@ -819,5 +819,5 @@ asmlinkage int compat_sys_rt_sigqueueinfo(int pid, int sig,
void compat_setup_restart_syscall(struct pt_regs *regs)
{
regs->regs[7] = __NR_restart_syscall;
regs->regs[7] = __NR_compat_restart_syscall;
}

123
arch/arm64/kernel/sys32.S
View File

@ -147,129 +147,6 @@ compat_sys_fanotify_mark_wrapper:
b sys_fanotify_mark
ENDPROC(compat_sys_fanotify_mark_wrapper)
/*
* Use the compat system call wrappers.
*/
#define sys_fork compat_sys_fork_wrapper
#define sys_open compat_sys_open
#define sys_execve compat_sys_execve_wrapper
#define sys_lseek compat_sys_lseek_wrapper
#define sys_mount compat_sys_mount
#define sys_ptrace compat_sys_ptrace
#define sys_times compat_sys_times
#define sys_ioctl compat_sys_ioctl
#define sys_fcntl compat_sys_fcntl
#define sys_ustat compat_sys_ustat
#define sys_sigaction compat_sys_sigaction
#define sys_sigsuspend compat_sys_sigsuspend
#define sys_sigpending compat_sys_sigpending
#define sys_setrlimit compat_sys_setrlimit
#define sys_getrusage compat_sys_getrusage
#define sys_gettimeofday compat_sys_gettimeofday
#define sys_settimeofday compat_sys_settimeofday
#define sys_statfs compat_sys_statfs
#define sys_fstatfs compat_sys_fstatfs
#define sys_setitimer compat_sys_setitimer
#define sys_getitimer compat_sys_getitimer
#define sys_newstat compat_sys_newstat
#define sys_newlstat compat_sys_newlstat
#define sys_newfstat compat_sys_newfstat
#define sys_wait4 compat_sys_wait4
#define sys_sysinfo compat_sys_sysinfo
#define sys_sigreturn compat_sys_sigreturn_wrapper
#define sys_clone compat_sys_clone_wrapper
#define sys_adjtimex compat_sys_adjtimex
#define sys_sigprocmask compat_sys_sigprocmask
#define sys_getdents compat_sys_getdents
#define sys_select compat_sys_select
#define sys_readv compat_sys_readv
#define sys_writev compat_sys_writev
#define sys_sysctl compat_sys_sysctl
#define sys_sched_rr_get_interval compat_sys_sched_rr_get_interval
#define sys_nanosleep compat_sys_nanosleep
#define sys_rt_sigreturn compat_sys_rt_sigreturn_wrapper
#define sys_rt_sigaction compat_sys_rt_sigaction
#define sys_rt_sigprocmask compat_sys_rt_sigprocmask
#define sys_rt_sigpending compat_sys_rt_sigpending
#define sys_rt_sigtimedwait compat_sys_rt_sigtimedwait
#define sys_rt_sigqueueinfo compat_sys_rt_sigqueueinfo
#define sys_rt_sigsuspend compat_sys_rt_sigsuspend
#define sys_pread64 compat_sys_pread64_wrapper
#define sys_pwrite64 compat_sys_pwrite64_wrapper
#define sys_sigaltstack compat_sys_sigaltstack_wrapper
#define sys_sendfile compat_sys_sendfile
#define sys_vfork compat_sys_vfork_wrapper
#define sys_getrlimit compat_sys_getrlimit
#define sys_mmap2 sys_mmap_pgoff
#define sys_truncate64 compat_sys_truncate64_wrapper
#define sys_ftruncate64 compat_sys_ftruncate64_wrapper
#define sys_getdents64 compat_sys_getdents64
#define sys_fcntl64 compat_sys_fcntl64
#define sys_readahead compat_sys_readahead_wrapper
#define sys_futex compat_sys_futex
#define sys_sched_setaffinity compat_sys_sched_setaffinity
#define sys_sched_getaffinity compat_sys_sched_getaffinity
#define sys_io_setup compat_sys_io_setup
#define sys_io_getevents compat_sys_io_getevents
#define sys_io_submit compat_sys_io_submit
#define sys_lookup_dcookie compat_sys_lookup_dcookie
#define sys_timer_create compat_sys_timer_create
#define sys_timer_settime compat_sys_timer_settime
#define sys_timer_gettime compat_sys_timer_gettime
#define sys_clock_settime compat_sys_clock_settime
#define sys_clock_gettime compat_sys_clock_gettime
#define sys_clock_getres compat_sys_clock_getres
#define sys_clock_nanosleep compat_sys_clock_nanosleep
#define sys_statfs64 compat_sys_statfs64_wrapper
#define sys_fstatfs64 compat_sys_fstatfs64_wrapper
#define sys_utimes compat_sys_utimes
#define sys_fadvise64_64 compat_sys_fadvise64_64_wrapper
#define sys_mq_open compat_sys_mq_open
#define sys_mq_timedsend compat_sys_mq_timedsend
#define sys_mq_timedreceive compat_sys_mq_timedreceive
#define sys_mq_notify compat_sys_mq_notify
#define sys_mq_getsetattr compat_sys_mq_getsetattr
#define sys_waitid compat_sys_waitid
#define sys_recv compat_sys_recv
#define sys_recvfrom compat_sys_recvfrom
#define sys_setsockopt compat_sys_setsockopt
#define sys_getsockopt compat_sys_getsockopt
#define sys_sendmsg compat_sys_sendmsg
#define sys_recvmsg compat_sys_recvmsg
#define sys_semctl compat_sys_semctl
#define sys_msgsnd compat_sys_msgsnd
#define sys_msgrcv compat_sys_msgrcv
#define sys_msgctl compat_sys_msgctl
#define sys_shmat compat_sys_shmat
#define sys_shmctl compat_sys_shmctl
#define sys_keyctl compat_sys_keyctl
#define sys_semtimedop compat_sys_semtimedop
#define sys_mbind compat_sys_mbind
#define sys_get_mempolicy compat_sys_get_mempolicy
#define sys_set_mempolicy compat_sys_set_mempolicy
#define sys_openat compat_sys_openat
#define sys_futimesat compat_sys_futimesat
#define sys_pselect6 compat_sys_pselect6
#define sys_ppoll compat_sys_ppoll
#define sys_set_robust_list compat_sys_set_robust_list
#define sys_get_robust_list compat_sys_get_robust_list
#define sys_sync_file_range2 compat_sys_sync_file_range2_wrapper
#define sys_vmsplice compat_sys_vmsplice
#define sys_move_pages compat_sys_move_pages
#define sys_epoll_pwait compat_sys_epoll_pwait
#define sys_kexec_load compat_sys_kexec_load
#define sys_utimensat compat_sys_utimensat
#define sys_signalfd compat_sys_signalfd
#define sys_fallocate compat_sys_fallocate_wrapper
#define sys_timerfd_settime compat_sys_timerfd_settime
#define sys_timerfd_gettime compat_sys_timerfd_gettime
#define sys_signalfd4 compat_sys_signalfd4
#define sys_preadv compat_sys_preadv
#define sys_pwritev compat_sys_pwritev
#define sys_rt_tgsigqueueinfo compat_sys_rt_tgsigqueueinfo
#define sys_recvmmsg compat_sys_recvmmsg
#define sys_fanotify_mark compat_sys_fanotify_mark_wrapper
#undef __SYSCALL
#define __SYSCALL(x, y) .quad y // x
#define __SYSCALL_COMPAT