Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd92d4a5 authored by AKASHI Takahiro's avatar AKASHI Takahiro Committed by Catalin Marinas
Browse files

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: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarAKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent d34a3ebd

arch/arm64/include/asm/compat.h

+0 −5
Original line number Diff line number Diff line
@@ -305,11 +305,6 @@ static inline int is_compat_thread(struct thread_info *thread) 


#else /* !CONFIG_COMPAT */



static inline int is_compat_task(void)

{

	return 0;

}



static inline int is_compat_thread(struct thread_info *thread)

{

	return 0;

arch/arm64/kernel/hw_breakpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#define pr_fmt(fmt) "hw-breakpoint: " fmt



#include <linux/compat.h>

#include <linux/cpu_pm.h>

#include <linux/errno.h>

#include <linux/hw_breakpoint.h>
@@ -27,7 +28,6 @@ 
#include <linux/ptrace.h>

#include <linux/smp.h>



#include <asm/compat.h>

#include <asm/current.h>

#include <asm/debug-monitors.h>

#include <asm/hw_breakpoint.h>

arch/arm64/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <stdarg.h>



#include <linux/compat.h>

#include <linux/export.h>

#include <linux/sched.h>

#include <linux/kernel.h>

arch/arm64/kernel/ptrace.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/compat.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/mm.h>

arch/arm64/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/compat.h>

#include <linux/errno.h>

#include <linux/signal.h>

#include <linux/personality.h>
@@ -25,7 +26,6 @@ 
#include <linux/tracehook.h>

#include <linux/ratelimit.h>



#include <asm/compat.h>

#include <asm/debug-monitors.h>

#include <asm/elf.h>

#include <asm/cacheflush.h>