diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-10 15:27:04 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-11 10:39:08 +0100 |
| commit | f3d447a97f24f7c1e14767e1974b8e5bc219bc07 (patch) | |
| tree | 6c07c07aa9ed0b781ce9be11bb54bc6248a882d0 /arch/arm64/kernel | |
| parent | 4ed27ecfcac538b4c578eb7fe87b8bf775a5ff68 (diff) | |
arm64: Do not include asm/unistd32.h in asm/unistd.h
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>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 1 | ||||
| -rw-r--r-- | arch/arm64/kernel/signal32.c | 4 | ||||
| -rw-r--r-- | arch/arm64/kernel/sys32.S | 3 | ||||
| -rw-r--r-- | arch/arm64/kernel/sys_compat.c | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 6538928ff1a..a6f3f7da688 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -26,6 +26,7 @@ #include <asm/errno.h> #include <asm/thread_info.h> #include <asm/unistd.h> +#include <asm/unistd32.h> /* * Bad Abort numbers diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 6001a44f8f6..4654824747a 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -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; diff --git a/arch/arm64/kernel/sys32.S b/arch/arm64/kernel/sys32.S index c1e46dbacef..54c4aec47a0 100644 --- a/arch/arm64/kernel/sys32.S +++ b/arch/arm64/kernel/sys32.S @@ -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> diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c index 93f10e27dc7..fd2b4cb0d13 100644 --- a/arch/arm64/kernel/sys_compat.c +++ b/arch/arm64/kernel/sys_compat.c @@ -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) { |