diff --git a/arch/sw_64/configs/junzhang_defconfig b/arch/sw_64/configs/junzhang_defconfig
index 2d9cae63cf6df00f2ceab2ceb522fbc0cfa0d02e..a7cb07d7af0e0c1ad110810191e1f57a097d96d2 100644
--- a/arch/sw_64/configs/junzhang_defconfig
+++ b/arch/sw_64/configs/junzhang_defconfig
@@ -356,7 +356,6 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# CONFIG_PCIEASPM is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_IOV=y
 CONFIG_UEVENT_HELPER=y
diff --git a/arch/sw_64/include/asm/hugetlb.h b/arch/sw_64/include/asm/hugetlb.h
index f4c8cbe0891a9fd138dfdd1e049a09b82b08ad44..eeeef6530a572312526e4cc4023371fb4de432c2 100644
--- a/arch/sw_64/include/asm/hugetlb.h
+++ b/arch/sw_64/include/asm/hugetlb.h
@@ -15,7 +15,7 @@ extern void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
 
 #define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR
 extern pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
-		unsigned long addr, pte_t *ptep);
+		unsigned long addr, pte_t *ptep, unsigned long sz);
 
 #define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH
 extern pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr,
diff --git a/arch/sw_64/kernel/vdso/note.S b/arch/sw_64/kernel/vdso/note.S
new file mode 100644
index 0000000000000000000000000000000000000000..2a956c942211140ea137a7203142d54d07144078
--- /dev/null
+++ b/arch/sw_64/kernel/vdso/note.S
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text.
+ * Here we can supply some information useful to userland.
+ */
+
+#include <linux/elfnote.h>
+#include <linux/version.h>
+
+ELFNOTE_START(Linux, 0, "a")
+	.long LINUX_VERSION_CODE
+ELFNOTE_END
diff --git a/arch/sw_64/mm/hugetlbpage_c4.c b/arch/sw_64/mm/hugetlbpage_c4.c
index 2611af9cf7807140a5740783ff45e96b18ebba91..eaeeaadb6546b5bc9fbda866f45a8ded1a75da6d 100644
--- a/arch/sw_64/mm/hugetlbpage_c4.c
+++ b/arch/sw_64/mm/hugetlbpage_c4.c
@@ -280,7 +280,8 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm,
 }
 
 pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
-		unsigned long addr, pte_t *ptep)
+			      unsigned long addr, pte_t *ptep,
+			      unsigned long sz)
 {
 	int ncontig;
 	size_t pgsize;
diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h
index dafdf12eca8b078431808d8e1ebf842a8ee34b35..1c780df8997abc17bc3419e8f5cd3aa6de05f85a 100644
--- a/tools/perf/util/genelf.h
+++ b/tools/perf/util/genelf.h
@@ -38,6 +38,7 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
 #define GEN_ELF_ARCH	EM_SPARC
 #define GEN_ELF_CLASS	ELFCLASS32
 #elif defined(__sw_64__)
+#define EM_SW64		0x9916
 #define GEN_ELF_ARCH	EM_SW64
 #define GEN_ELF_CLASS	ELFCLASS64
 #elif defined(__s390x__)