From: Catalin Marinas <catalin.marinas@arm.com>
Date: Tue, 25 Mar 2025 19:32:28 +0000 (+0000)
Subject: Merge branch 'for-next/smt-control' into for-next/core
X-Git-Tag: v6.15-rc1~201^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ae9e2d8325698edc1335ede5401f68bcd7cc400;p=thirdparty%2Flinux.git

Merge branch 'for-next/smt-control' into for-next/core

* for-next/smt-control:
  : Support SMT control on arm64
  arm64: Kconfig: Enable HOTPLUG_SMT
  arm64: topology: Support SMT control on ACPI based system
  arch_topology: Support SMT control for OF based system
  cpu/SMT: Provide a default topology_is_primary_thread()
---

8ae9e2d8325698edc1335ede5401f68bcd7cc400
diff --cc arch/arm64/kernel/topology.c
index 9e3583720668a,0bcea4f89ea82..5d07ee85bdae4
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@@ -15,9 -15,10 +15,11 @@@
  #include <linux/arch_topology.h>
  #include <linux/cacheinfo.h>
  #include <linux/cpufreq.h>
+ #include <linux/cpu_smt.h>
  #include <linux/init.h>
  #include <linux/percpu.h>
 +#include <linux/sched/isolation.h>
+ #include <linux/xarray.h>
  
  #include <asm/cpu.h>
  #include <asm/cputype.h>