diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2015-01-06 12:01:56 -0500 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-01-27 04:38:08 -0500 |
commit | 9648606946b3b0c608846dddb30482b48a6f5c68 (patch) | |
tree | 3149871a9f489381e47b92f9312b90b392dbd74b | |
parent | 0156411b1828771c09c92f034e7b81f702b84f07 (diff) |
arm64: Remove asm/syscalls.h
This patch moves the sys_rt_sigreturn_wrapper prototype to
arch/arm64/kernel/sys.c and removes the asm/syscalls.h header.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r-- | arch/arm64/include/asm/syscalls.h | 30 | ||||
-rw-r--r-- | arch/arm64/kernel/sys.c | 3 |
2 files changed, 1 insertions, 32 deletions
diff --git a/arch/arm64/include/asm/syscalls.h b/arch/arm64/include/asm/syscalls.h deleted file mode 100644 index 48fe7c600e98..000000000000 --- a/arch/arm64/include/asm/syscalls.h +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2012 ARM Ltd. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #ifndef __ASM_SYSCALLS_H | ||
17 | #define __ASM_SYSCALLS_H | ||
18 | |||
19 | #include <linux/linkage.h> | ||
20 | #include <linux/compiler.h> | ||
21 | #include <linux/signal.h> | ||
22 | |||
23 | /* | ||
24 | * System call wrappers implemented in kernel/entry.S. | ||
25 | */ | ||
26 | asmlinkage long sys_rt_sigreturn_wrapper(void); | ||
27 | |||
28 | #include <asm-generic/syscalls.h> | ||
29 | |||
30 | #endif /* __ASM_SYSCALLS_H */ | ||
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index 3fa98ff14f0e..dec351a9f3d6 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c | |||
@@ -39,10 +39,9 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len, | |||
39 | /* | 39 | /* |
40 | * Wrappers to pass the pt_regs argument. | 40 | * Wrappers to pass the pt_regs argument. |
41 | */ | 41 | */ |
42 | asmlinkage long sys_rt_sigreturn_wrapper(void); | ||
42 | #define sys_rt_sigreturn sys_rt_sigreturn_wrapper | 43 | #define sys_rt_sigreturn sys_rt_sigreturn_wrapper |
43 | 44 | ||
44 | #include <asm/syscalls.h> | ||
45 | |||
46 | #undef __SYSCALL | 45 | #undef __SYSCALL |
47 | #define __SYSCALL(nr, sym) [nr] = sym, | 46 | #define __SYSCALL(nr, sym) [nr] = sym, |
48 | 47 | ||