Commit 77e65a85 authored by Xiongfeng Wang's avatar Xiongfeng Wang Committed by Yang Yingliang
Browse files

arm64: ilp32: fix kabi change 



hulk inclusion
category: feature
bugzilla: NA
CVE: NA
---------------------------

The following commit add 'include <linux/compat.h>' in
arch/arm64/include/asm/elf.h because it needs to refer
'is_compat_task()' which is implemented in
'arch/arm64/include/asm/is_compat.h'. But this will cause kabi change.

commit c43af1fd804dfd4d653aa3f8ba5ca0cc4ce818e6
arm64: introduce is_a32_compat_{task,thread} for AArch32 compat

Since 'asm/is_compat.h' has been included by 'asm/processor.h', which is
included by 'asm/elf.h', we don't need to include 'linux/compat.h'.

When CONFIG_COMPAT is disabled, 'is_compat_task()' is not defined. We
need to defined it as zero as what is done in 'linux/compat.h'.

Signed-off-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarHanjun Guo &lt;guohanjun@huawei.com <mailto:guohanjun@huawei.com&gt;>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent ab6d2f96

arch/arm64/include/asm/elf.h

+6 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
#ifndef __ASM_ELF_H

#define __ASM_ELF_H



#ifndef __ASSEMBLY__

#include <linux/compat.h>

#endif



#include <asm/hwcap.h>



/*
@@ -173,6 +169,12 @@ struct linux_binprm; 
extern int arch_setup_additional_pages(struct linux_binprm *bprm,

				       int uses_interp);



#ifndef CONFIG_COMPAT

#ifndef is_compat_task

#define is_compat_task() (0)

#endif

#endif



/* 1GB of VA */

#define STACK_RND_MASK			(is_compat_task() ? \

						0x7ff >> (PAGE_SHIFT - 12) : \