diff --git a/arch/sw_64/include/asm/pgtable.h b/arch/sw_64/include/asm/pgtable.h
index 1a5828c4b6d64bee85d13ec6b2ef48090e6b10ee..609b51c25105631512fb6c1c4f9158cf31ca5e1a 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)
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 b551b741653d251d6155a214023b2215ae02e871..5e1e648aeec4c8216371ce84c92528be39c82eaa 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__
 
diff --git a/tools/perf/arch/sw_64/include/perf_regs.h b/tools/perf/arch/sw_64/include/perf_regs.h
index e0c1b15375b5c2c7e975df45adeb644d1eed2ccf..333c6d6539aa0a5dba7969fe564c37de4ecdb740 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: