From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Apr 2026 21:24:45 +0000 (-0700)
Subject: Merge tag 'x86_cpu_for_7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f2bb6c7b364f186aa37c524f6df33bd488d4efa;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'x86_cpu_for_7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cpu updates from Dave Hansen:

 - Complete LASS enabling: deal with vsyscall and EFI

   The existing Linear Address Space Separation (LASS) support punted
   on support for common EFI and vsyscall configs. Complete the
   implementation by supporting EFI and vsyscall=xonly.

 - Clean up CPUID usage in newer Intel "avs" audio driver and update the
   x86-cpuid-db file

* tag 'x86_cpu_for_7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools/x86/kcpuid: Update bitfields to x86-cpuid-db v3.0
  ASoC: Intel: avs: Include CPUID header at file scope
  ASoC: Intel: avs: Check maximum valid CPUID leaf
  x86/cpu: Remove LASS restriction on vsyscall emulation
  x86/vsyscall: Disable LASS if vsyscall mode is set to EMULATE
  x86/vsyscall: Restore vsyscall=xonly mode under LASS
  x86/traps: Consolidate user fixups in the #GP handler
  x86/vsyscall: Reorganize the page fault emulation code
  x86/cpu: Remove LASS restriction on EFI
  x86/efi: Disable LASS while executing runtime services
  x86/cpu: Defer LASS enabling until userspace comes up
---

9f2bb6c7b364f186aa37c524f6df33bd488d4efa
diff --cc arch/x86/kernel/cpu/common.c
index ec0670114efab,02472fc763d9b..8060cccd24d82
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -2061,8 -2047,13 +2063,7 @@@ static void identify_cpu(struct cpuinfo
  	setup_smep(c);
  	setup_smap(c);
  	setup_umip(c);
- 	setup_lass(c);
  
 -	/* Enable FSGSBASE instructions if available. */
 -	if (cpu_has(c, X86_FEATURE_FSGSBASE)) {
 -		cr4_set_bits(X86_CR4_FSGSBASE);
 -		elf_hwcap2 |= HWCAP2_FSGSBASE;
 -	}
 -
  	/*
  	 * The vendor-specific functions might have changed features.
  	 * Now we do "generic changes."