From 7da2637eb5e91f3b0f42f9c1666cec51c28cd529 Mon Sep 17 00:00:00 2001 From: Gu Mi Date: Tue, 12 Sep 2023 11:37:54 +0800 Subject: [PATCH 1/3] anolis: mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t * ANBZ: #4688 Fix some build warning and error, change infterface pud_page_vaddr to pud_pgtable for compatibility. Signed-off-by: Gu Mi --- arch/sw_64/include/asm/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sw_64/include/asm/pgtable.h b/arch/sw_64/include/asm/pgtable.h index 1a5828c4b6d6..609b51c25105 100644 --- a/arch/sw_64/include/asm/pgtable.h +++ b/arch/sw_64/include/asm/pgtable.h @@ -255,9 +255,9 @@ static inline unsigned long p4d_page_vaddr(p4d_t p4d) return (unsigned long)pfn_to_virt(p4d_val(p4d) >> _PFN_SHIFT); } -static inline unsigned long pud_page_vaddr(pud_t pud) +static inline pmd_t *pud_pgtable(pud_t pud) { - return (unsigned long)pfn_to_virt(pud_val(pud) >> _PFN_SHIFT); + return (pmd_t *)pfn_to_virt(pud_val(pud) >> _PFN_SHIFT); } static inline int pte_none(pte_t pte) -- Gitee From 16b23ced8dff2015ae1e8ea482d7b27b6180a173 Mon Sep 17 00:00:00 2001 From: Gu Mi Date: Tue, 12 Sep 2023 11:50:57 +0800 Subject: [PATCH 2/3] anolis: sw64: rename perf_reg_name to __perf_reg_name ANBZ: #4688 change name perf_reg_name to __perf_reg_name for solving compile issue. Signed-off-by: Gu Mi --- tools/perf/arch/sw_64/include/perf_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/arch/sw_64/include/perf_regs.h b/tools/perf/arch/sw_64/include/perf_regs.h index e0c1b15375b5..333c6d6539aa 100644 --- a/tools/perf/arch/sw_64/include/perf_regs.h +++ b/tools/perf/arch/sw_64/include/perf_regs.h @@ -15,7 +15,7 @@ void perf_regs_load(u64 *regs); #define PERF_REG_IP PERF_REG_SW64_PC #define PERF_REG_SP PERF_REG_SW64_SP -static inline const char *perf_reg_name(int id) +static inline const char *__perf_reg_name(int id) { switch (id) { case PERF_REG_SW64_R0: -- Gitee From ba5280f892514c03ee40f99488cd646d401e5ec9 Mon Sep 17 00:00:00 2001 From: Gu Mi Date: Tue, 12 Sep 2023 18:53:33 +0800 Subject: [PATCH 3/3] anolis: sw64: fix compile issue dut to lack of WITH Linux-syscall-note ANBZ: #4688 Lack of "WITH Linux-syscall-note" in bpf_perf_event.h leads to compile issue. add the string to file. Signed-off-by: Gu Mi --- arch/sw_64/include/uapi/asm/bpf_perf_event.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sw_64/include/uapi/asm/bpf_perf_event.h b/arch/sw_64/include/uapi/asm/bpf_perf_event.h index b551b741653d..5e1e648aeec4 100644 --- a/arch/sw_64/include/uapi/asm/bpf_perf_event.h +++ b/arch/sw_64/include/uapi/asm/bpf_perf_event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__ #define _UAPI__ASM_BPF_PERF_EVENT_H__ -- Gitee