diff options
author | Eric Paris <eparis@redhat.com> | 2014-04-22 12:07:30 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2014-09-23 16:21:27 -0400 |
commit | 75dddcbd9651eec29708f91149e405cd42cf68d7 (patch) | |
tree | 8462eeb1e9b88d0cd8196e848881b4ffb9565d2c /arch | |
parent | a9ebe0b98896b276a3a1664da5f40d3b7c92f316 (diff) |
sparc: simplify syscall_get_arch()
Include linux/thread_info.h so we can use is_32_bit_task() cleanly.
Then just simplify syscall_get_arch() since is_32_bit_task() works for
all configuration options.
Suggested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/include/asm/syscall.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h index 427154444f6d..6fa2708da153 100644 --- a/arch/powerpc/include/asm/syscall.h +++ b/arch/powerpc/include/asm/syscall.h | |||
@@ -14,8 +14,8 @@ | |||
14 | #define _ASM_SYSCALL_H 1 | 14 | #define _ASM_SYSCALL_H 1 |
15 | 15 | ||
16 | #include <uapi/linux/audit.h> | 16 | #include <uapi/linux/audit.h> |
17 | #include <linux/compat.h> | ||
18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
18 | #include <linux/thread_info.h> | ||
19 | 19 | ||
20 | /* ftrace syscalls requires exporting the sys_call_table */ | 20 | /* ftrace syscalls requires exporting the sys_call_table */ |
21 | #ifdef CONFIG_FTRACE_SYSCALLS | 21 | #ifdef CONFIG_FTRACE_SYSCALLS |
@@ -90,12 +90,6 @@ static inline void syscall_set_arguments(struct task_struct *task, | |||
90 | 90 | ||
91 | static inline int syscall_get_arch(void) | 91 | static inline int syscall_get_arch(void) |
92 | { | 92 | { |
93 | int arch = AUDIT_ARCH_PPC; | 93 | return is_32bit_task() ? AUDIT_ARCH_PPC : AUDIT_ARCH_PPC64; |
94 | |||
95 | #ifdef CONFIG_PPC64 | ||
96 | if (!is_32bit_task()) | ||
97 | arch = AUDIT_ARCH_PPC64; | ||
98 | #endif | ||
99 | return arch; | ||
100 | } | 94 | } |
101 | #endif /* _ASM_SYSCALL_H */ | 95 | #endif /* _ASM_SYSCALL_H */ |