Forcefully override ARCH from x86_64 to x86 to handle the scenario where
the user specifies ARCH=x86_64 on the command line.

Fixes: 9af04539d474 ("KVM: selftests: Override ARCH for x86_64 instead of using ARCH_DIR")
Cc: stable@vger.kernel.org
Reported-by: David Matlack <dmatlack@google.com>
Closes: https://lore.kernel.org/all/20250724213130.3374922-1-dmatlack@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 tools/testing/selftests/kvm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
index d9fffe06d3ea..f2b223072b62 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -6,7 +6,7 @@ ARCH            ?= $(SUBARCH)
 ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64 loongarch))
 # Top-level selftests allows ARCH=x86_64 :-(
 ifeq ($(ARCH),x86_64)
-	ARCH := x86
+	override ARCH := x86
 endif
 include Makefile.kvm
 else

base-commit: a6ad54137af92535cfe32e19e5f3bc1bb7dbd383
-- 
2.51.0.710.ga91ca5db03-goog

On Tue, 07 Oct 2025 15:30:57 -0700, Sean Christopherson wrote:
> Forcefully override ARCH from x86_64 to x86 to handle the scenario where
> the user specifies ARCH=x86_64 on the command line.

Applied to kvm-x86 selftests, thanks!  I'm deliberately not sending this
straight to 6.18 to give us a full cycle of testing (changes to selftests
infrastructure have been notoriously brittle), but I tagged it for stable so
that it'll eventually land in LTS kernels.

[1/1] KVM: selftests: Forcefully override ARCH from x86_64 to x86
      https://github.com/kvm-x86/linux/commit/17e5a9b77716

--
https://github.com/kvm-x86/linux/tree/next