Messages in this thread Patch in this message | | | From | AKASHI Takahiro <> | Subject | [PATCH 2/2] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h | Date | Fri, 7 Feb 2014 19:11:32 +0900 |
| |
kernel/seccomp.c includes linux/compat.h and, indicrectly, asm/compat.h via asm/syscall.h. Due to the duplicated definition of is_compat_task, compiling this file will fail in the case of !CONFIG_COMPAT. This patch makes the definition in asm/compat.h valid only if necessary.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- arch/arm64/include/asm/compat.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index fda2704..72f3b18 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -305,10 +305,12 @@ static inline int is_compat_thread(struct thread_info *thread) #else /* !CONFIG_COMPAT */ +#ifndef is_compat_task /* it's there in linux/compat.h */ static inline int is_compat_task(void) { return 0; } +#endif static inline int is_compat_thread(struct thread_info *thread) { -- 1.7.9.5
| |