Commit 89f6602d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cf52ad5f b2381acd

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1525,7 +1525,6 @@ config AMD_MEM_ENCRYPT 


config AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT

	bool "Activate AMD Secure Memory Encryption (SME) by default"

	default y

	depends on AMD_MEM_ENCRYPT

	help

	  Say yes to have system memory encrypted by default if running on

arch/x86/kernel/fpu/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static int __fpu_restore_sig(void __user *buf, void __user *buf_fx, 
				return -EINVAL;

		} else {

			/* Mask invalid bits out for historical reasons (broken hardware). */

			fpu->state.fxsave.mxcsr &= ~mxcsr_feature_mask;

			fpu->state.fxsave.mxcsr &= mxcsr_feature_mask;

		}



		/* Enforce XFEATURE_MASK_FPSSE when XSAVE is enabled */