From: Jialin Zhang zhangjialin11@huawei.com
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4JBL0 CVE: NA
-------------------------------
Reserve space for the structure cpu_hwcap_keys and cpu_hwcaps.
Signed-off-by: Jialin Zhang zhangjialin11@huawei.com Reviewed-by: wangxiongfeng wangxiongfeng2@huawei.com Reviewed-by: Yang Yingliang yangyingliang@huawei.com Reviewed-by: Hanjun Guo guohanjun@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- arch/arm64/include/asm/cpucaps.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index 93bae3795165..c58a1919bfc9 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -72,6 +72,6 @@ #define ARM64_HAS_TWED 62 #define ARM64_WORKAROUND_HISILICON_1980005 63
-#define ARM64_NCAPS 64 +#define ARM64_NCAPS 80
#endif /* __ASM_CPUCAPS_H */
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4KFY7?from=project-issue CVE: NA
-------------------------------
Revert this patch to fix following compile error:
In file included from <command-line>:32: ./usr/include/linux/ptp_clock.h:135:2: error: expected specifier-qualifier-list before ‘KABI_RESERVE’ KABI_RESERVE(1) ^~~~~~~~~~~~ make[2]: *** [usr/include/Makefile:108: usr/include/linux/ptp_clock.hdrtest] Error 1
This reverts commit af9f9bb9d9e9455ab5bfbdcc5d1f7c88edc4fcd7.
Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com Reviewed-by: Wang ShaoBo bobo.shaobowang@huawei.com Reviewed-by: Cheng Jian cj.chengjian@huawei.com --- include/uapi/linux/ptp_clock.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/include/uapi/linux/ptp_clock.h b/include/uapi/linux/ptp_clock.h index 5bd86524642d..1d108d597f66 100644 --- a/include/uapi/linux/ptp_clock.h +++ b/include/uapi/linux/ptp_clock.h @@ -132,10 +132,6 @@ struct ptp_perout_request { /* Reserved for future use. */ unsigned int rsv[4]; }; - KABI_RESERVE(1) - KABI_RESERVE(2) - KABI_RESERVE(3) - KABI_RESERVE(4) };
#define PTP_MAX_SAMPLES 25 /* Maximum allowed offset measurement samples. */
-
Zheng Zengkai