Merge tag 'v6.1.110' into 6.1-main

This is the 6.1.110 stable release

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmbisBEACgkQONu9yGCS
# aT5rSxAAqvP39A2WW8XvGnh7L+Pp0qPKl7PZExrFNiCFMQGUGvIpYCVt1cmazCp0
# eaehtykEwAfJBMxlHRdWvr0S6QwSAGv16+J52U3kCgri+LgtHdmeuyEW/1IhHyhI
# DKyx26aV4i/ATpaJPdPwuSE9qWGSXbKj1oosGZN+4c4+Khsi6BnuIVTr2T1anGQU
# xTHpZWn80oU2g4uus1mZf3Hc7qv4943yAOkQRPnMSvClIgGTs43Ab+1DN76ADyfi
# txPPIFI7wEgBZt4TdPgAG5EB/zLlJf9iLxp2sOXi+SFUImpy90SIZMeI2jkmQDv5
# +EEsb7oSvOYgt51eP0l/cyzOMFnssYxkOiYtxqWFdhofaJbmdAs3By928jEoXaAQ
# lB5X57haTp6eDohEXVnxTLfMHd8ExKOgSEwMAAxqmuPfd77uROxXBj7QlVhRABge
# OUxcB/2CSukq8dbEZAMsUjv/rAscTLsRVK0AxOhQjfwynNegdjRYIf9AMV2jbZyV
# YYLnZD87TGZU3b45kjozols6Ml2ehfGHsFdnXrEo6p4/MhBiVQcNmRdbF1Fnbi8v
# U4Edg9UpLOV99NponXqHTwptRHuMzqtp1m2HhIjHqTk2zNMtxXjMIvNtw0++2yqi
# 1kzjFY19rz8FpWkkOw/gswTwN2ygicGvoED/BohlYgFZnBEg+5c=
# =z5/t
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu Sep 12 11:10:41 2024 CEST
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 109
+SUBLEVEL = 110
 EXTRAVERSION =
 NAME = Curry Ramen
 

arch/arm64/include/asm/acpi.h

@@ -97,6 +97,18 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
 	return	acpi_cpu_get_madt_gicc(cpu)->uid;
 }
 
+static inline int get_cpu_for_acpi_id(u32 uid)
+{
+	int cpu;
+
+	for (cpu = 0; cpu < nr_cpu_ids; cpu++)
+		if (acpi_cpu_get_madt_gicc(cpu) &&
+		    uid == get_acpi_id_for_cpu(cpu))
+			return cpu;
+
+	return -EINVAL;
+}
+
 static inline void arch_fix_phys_package_id(int num, u32 slot) { }
 void __init acpi_init_cpus(void);
 int apei_claim_sea(struct pt_regs *regs);

arch/arm64/kernel/acpi_numa.c

@@ -34,17 +34,6 @@ int __init acpi_numa_get_nid(unsigned int cpu)
 	return acpi_early_node_map[cpu];
 }
 
-static inline int get_cpu_for_acpi_id(u32 uid)
-{
-	int cpu;
-
-	for (cpu = 0; cpu < nr_cpu_ids; cpu++)
-		if (uid == get_acpi_id_for_cpu(cpu))
-			return cpu;
-
-	return -EINVAL;
-}
-
 static int __init acpi_parse_gicc_pxm(union acpi_subtable_headers *header,
 				      const unsigned long end)
 {

arch/mips/kernel/cevt-r4k.c

@@ -303,13 +303,6 @@ int r4k_clockevent_init(void)
 	if (!c0_compare_int_usable())
 		return -ENXIO;
 
-	/*
-	 * With vectored interrupts things are getting platform specific.
-	 * get_c0_compare_int is a hook to allow a platform to return the
-	 * interrupt number of its liking.
-	 */
-	irq = get_c0_compare_int();
-
 	cd = &per_cpu(mips_clockevent_device, cpu);
 
 	cd->name		= "MIPS";
@@ -320,7 +313,6 @@ int r4k_clockevent_init(void)
 	min_delta		= calculate_min_delta();
 
 	cd->rating		= 300;
-	cd->irq			= irq;
 	cd->cpumask		= cpumask_of(cpu);
 	cd->set_next_event	= mips_next_event;
 	cd->event_handler	= mips_event_handler;
@@ -332,6 +324,13 @@ int r4k_clockevent_init(void)
 
 	cp0_timer_irq_installed = 1;
 
+	/*
+	 * With vectored interrupts things are getting platform specific.
+	 * get_c0_compare_int is a hook to allow a platform to return the
+	 * interrupt number of its liking.
+	 */
+	irq = get_c0_compare_int();
+
 	if (request_irq(irq, c0_compare_interrupt, flags, "timer",
 			c0_compare_interrupt))
 		pr_err("Failed to request irq %d (timer)\n", irq);

arch/powerpc/include/asm/nohash/mmu-e500.h

@@ -303,8 +303,7 @@ extern unsigned long linear_map_top;
 extern int book3e_htw_mode;
 
 #define PPC_HTW_NONE	0
-#define PPC_HTW_IBM	1
-#define PPC_HTW_E6500	2
+#define PPC_HTW_E6500	1
 
 /*
  * 64-bit booke platforms don't load the tlb in the tlb miss handler code.

arch/powerpc/mm/nohash/Makefile

@@ -3,7 +3,7 @@
 ccflags-$(CONFIG_PPC64)	:= $(NO_MINIMAL_TOC)
 
 obj-y				+= mmu_context.o tlb.o tlb_low.o kup.o
-obj-$(CONFIG_PPC_BOOK3E_64)  	+= tlb_low_64e.o book3e_pgtable.o
+obj-$(CONFIG_PPC_BOOK3E_64)  	+= tlb_64e.o tlb_low_64e.o book3e_pgtable.o
 obj-$(CONFIG_40x)		+= 40x.o
 obj-$(CONFIG_44x)		+= 44x.o
 obj-$(CONFIG_PPC_8xx)		+= 8xx.o