Merge tag 'x86-urgent-2026-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:

 - Don't print reset reason in VMs, to fix Xen PV domU boot
   regression on AMD Zen CPUs (Jason Andryuk)

 - Preserve the default VGA fallback for legacy modes, to fix
   regression where a SeaBIOS QEMU guest with bochs and VKMS
   the boot VGA (bochs) loses its DRM boot_display attribute
   (Hengyu Liang)

 - Ensure write visibility during LDT installation (Dave Hansen)

* tag 'x86-urgent-2026-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Ensure write visibility during LDT installation
  x86/video: Preserve the default VGA fallback for legacy modes
  x86/CPU/AMD: Don't print reset reason in VMs
This commit is contained in:
Linus Torvalds
2026-11-15 09:18:05 -08:00
3 changed files with 12 additions and 5 deletions
+2 -1
View File
@@ -1367,7 +1367,8 @@ static __init int print_s5_reset_status_mmio(void)
u32 value;
int i;
if (!cpu_feature_enabled(X86_FEATURE_ZEN))
if (!cpu_feature_enabled(X86_FEATURE_ZEN) ||
cpu_feature_enabled(X86_FEATURE_HYPERVISOR))
return 0;
addr = ioremap(FCH_PM_BASE + FCH_PM_S5_RESET_STATUS, sizeof(value));
+9 -3
View File
@@ -43,7 +43,7 @@ void load_mm_ldt(struct mm_struct *mm)
{
struct ldt_struct *ldt;
/* READ_ONCE synchronizes with smp_store_release */
/* Pairs with WRITE_ONCE() in install_ldt() */
ldt = READ_ONCE(mm->context.ldt);
/*
@@ -422,8 +422,14 @@ static void install_ldt(struct mm_struct *mm, struct ldt_struct *ldt)
{
mutex_lock(&mm->context.lock);
/* Synchronizes with READ_ONCE in load_mm_ldt. */
smp_store_release(&mm->context.ldt, ldt);
/*
* Ensure that new mm user CPUs either see the new LDT value
* or get an IPI. Make the store visible before reading
* mm_cpumask(). New mm users make their mm_cpumask() writes
* visible before reading mm->context.ldt.
*/
WRITE_ONCE(mm->context.ldt, ldt);
smp_mb();
/* Activate the LDT for all CPUs using currents mm. */
on_each_cpu_mask(mm_cpumask(mm), flush_ldt, mm, true);
+1 -1
View File
@@ -45,7 +45,7 @@ bool video_is_primary_device(struct device *dev)
#ifdef CONFIG_SCREEN_INFO
numres = screen_info_resources(si, res, ARRAY_SIZE(res));
if (numres > 0) {
if (numres > 0 && __screen_info_has_lfb(screen_info_video_type(si))) {
for (i = 0; i < numres; ++i) {
if (!(res[i].flags & IORESOURCE_MEM))
continue;