tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'x86_urgent_for_v5.15_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:

- Do not enable AMD memory encryption in Kconfig by default due to
shortcomings of some platforms, leading to boot failures.

- Mask out invalid bits in the MXCSR for 32-bit kernels again because
Thomas and I don't know how to mask out bits properly. Third time's
the charm.

* tag 'x86_urgent_for_v5.15_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/fpu: Mask out the invalid MXCSR bits properly
x86/Kconfig: Do not enable AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT automatically

Linus Torvalds 89f6602d cf52ad5f

+1 -2
-1
arch/x86/Kconfig
··· 1525 1525 1526 1526 config AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT 1527 1527 bool "Activate AMD Secure Memory Encryption (SME) by default" 1528 - default y 1529 1528 depends on AMD_MEM_ENCRYPT 1530 1529 help 1531 1530 Say yes to have system memory encrypted by default if running on
+1 -1
arch/x86/kernel/fpu/signal.c
··· 385 385 return -EINVAL; 386 386 } else { 387 387 /* Mask invalid bits out for historical reasons (broken hardware). */ 388 - fpu->state.fxsave.mxcsr &= ~mxcsr_feature_mask; 388 + fpu->state.fxsave.mxcsr &= mxcsr_feature_mask; 389 389 } 390 390 391 391 /* Enforce XFEATURE_MASK_FPSSE when XSAVE is enabled */