diff options
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 6538928ff1ab..a6f3f7da6880 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <asm/errno.h> | 26 | #include <asm/errno.h> |
27 | #include <asm/thread_info.h> | 27 | #include <asm/thread_info.h> |
28 | #include <asm/unistd.h> | 28 | #include <asm/unistd.h> |
29 | #include <asm/unistd32.h> | ||
29 | 30 | ||
30 | /* | 31 | /* |
31 | * Bad Abort numbers | 32 | * Bad Abort numbers |
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 6001a44f8f6b..4654824747a4 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c | |||
@@ -18,8 +18,6 @@ | |||
18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define __SYSCALL_COMPAT | ||
22 | |||
23 | #include <linux/compat.h> | 21 | #include <linux/compat.h> |
24 | #include <linux/signal.h> | 22 | #include <linux/signal.h> |
25 | #include <linux/syscalls.h> | 23 | #include <linux/syscalls.h> |
@@ -28,7 +26,7 @@ | |||
28 | #include <asm/fpsimd.h> | 26 | #include <asm/fpsimd.h> |
29 | #include <asm/signal32.h> | 27 | #include <asm/signal32.h> |
30 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
31 | #include <asm/unistd.h> | 29 | #include <asm/unistd32.h> |
32 | 30 | ||
33 | struct compat_sigaction { | 31 | struct compat_sigaction { |
34 | compat_uptr_t sa_handler; | 32 | compat_uptr_t sa_handler; |
diff --git a/arch/arm64/kernel/sys32.S b/arch/arm64/kernel/sys32.S index c1e46dbacefc..54c4aec47a08 100644 --- a/arch/arm64/kernel/sys32.S +++ b/arch/arm64/kernel/sys32.S | |||
@@ -149,11 +149,10 @@ ENDPROC(compat_sys_fanotify_mark_wrapper) | |||
149 | 149 | ||
150 | #undef __SYSCALL | 150 | #undef __SYSCALL |
151 | #define __SYSCALL(x, y) .quad y // x | 151 | #define __SYSCALL(x, y) .quad y // x |
152 | #define __SYSCALL_COMPAT | ||
153 | 152 | ||
154 | /* | 153 | /* |
155 | * The system calls table must be 4KB aligned. | 154 | * The system calls table must be 4KB aligned. |
156 | */ | 155 | */ |
157 | .align 12 | 156 | .align 12 |
158 | ENTRY(compat_sys_call_table) | 157 | ENTRY(compat_sys_call_table) |
159 | #include <asm/unistd.h> | 158 | #include <asm/unistd32.h> |
diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c index 93f10e27dc79..fd2b4cb0d13b 100644 --- a/arch/arm64/kernel/sys_compat.c +++ b/arch/arm64/kernel/sys_compat.c | |||
@@ -18,8 +18,6 @@ | |||
18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define __SYSCALL_COMPAT | ||
22 | |||
23 | #include <linux/compat.h> | 21 | #include <linux/compat.h> |
24 | #include <linux/personality.h> | 22 | #include <linux/personality.h> |
25 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
@@ -28,7 +26,7 @@ | |||
28 | #include <linux/uaccess.h> | 26 | #include <linux/uaccess.h> |
29 | 27 | ||
30 | #include <asm/cacheflush.h> | 28 | #include <asm/cacheflush.h> |
31 | #include <asm/unistd.h> | 29 | #include <asm/unistd32.h> |
32 | 30 | ||
33 | asmlinkage int compat_sys_fork(struct pt_regs *regs) | 31 | asmlinkage int compat_sys_fork(struct pt_regs *regs) |
34 | { | 32 | { |