diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-10 10:27:04 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-11 05:39:08 -0400 |
commit | f3d447a97f24f7c1e14767e1974b8e5bc219bc07 (patch) | |
tree | 6c07c07aa9ed0b781ce9be11bb54bc6248a882d0 /arch/arm64/include/asm/unistd.h | |
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/include/asm/unistd.h')
-rw-r--r-- | arch/arm64/include/asm/unistd.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 8f03dee066ed..9a981b2663c4 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h | |||
@@ -14,12 +14,20 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #ifndef __SYSCALL_COMPAT | ||
18 | #include <asm-generic/unistd.h> | 17 | #include <asm-generic/unistd.h> |
19 | #endif | ||
20 | 18 | ||
21 | #ifdef __KERNEL__ | 19 | #ifdef __KERNEL__ |
22 | #ifdef CONFIG_COMPAT | 20 | #ifdef CONFIG_COMPAT |
23 | #include <asm/unistd32.h> | 21 | #define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION |
22 | #define __ARCH_WANT_COMPAT_STAT64 | ||
23 | #define __ARCH_WANT_SYS_GETHOSTNAME | ||
24 | #define __ARCH_WANT_SYS_PAUSE | ||
25 | #define __ARCH_WANT_SYS_GETPGRP | ||
26 | #define __ARCH_WANT_SYS_LLSEEK | ||
27 | #define __ARCH_WANT_SYS_NICE | ||
28 | #define __ARCH_WANT_SYS_SIGPENDING | ||
29 | #define __ARCH_WANT_SYS_SIGPROCMASK | ||
30 | #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND | ||
31 | #define __ARCH_WANT_COMPAT_SYS_SENDFILE | ||
24 | #endif | 32 | #endif |
25 | #endif | 33 | #endif |