arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h
authorAKASHI Takahiro <takahiro.akashi@linaro.org>
Wed, 30 Apr 2014 09:51:32 +0000 (10:51 +0100)
committerJP Abgrall <jpa@google.com>
Thu, 18 Sep 2014 01:21:04 +0000 (18:21 -0700)
commitba27127b4730d9352bfda24553d1994cddd9edb3
treed5e48134dec976f7d5f64680aea22691c5fbc559
parent4b3735631fcc1056af00e382833727342f12c259
arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h

Some kernel files may include both linux/compat.h and asm/compat.h directly
or indirectly. Since both header files contain is_compat_task() under
!CONFIG_COMPAT, compiling them with !CONFIG_COMPAT will eventually fail.
Such files include kernel/auditsc.c, kernel/seccomp.c and init/do_mountfs.c
(do_mountfs.c may read asm/compat.h via asm/ftrace.h once ftrace is
implemented).

So this patch proactively
1) removes is_compat_task() under !CONFIG_COMPAT from asm/compat.h
2) replaces asm/compat.h to linux/compat.h in kernel/*.c,
   but asm/compat.h is still necessary in ptrace.c and process.c because
   they use is_compat_thread().

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Conflicts:
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/ptrace.c

Change-Id: I5b8330e43ab8bdd383cd410d8223d6c1a39fa0fc
arch/arm64/include/asm/compat.h
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/process.c
arch/arm64/kernel/signal.c