diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-26 11:06:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-26 11:10:35 +0100 |
| commit | 2e5fc4786b7ad311393a70894c773aa106c6dbb3 (patch) | |
| tree | 5eb9d382795a6739f1c556eaf69fdcfa6b265b7e /arch/x86/Kconfig | |
| parent | 29cd85557d8b8b3d068b5c29fdd9a0fa9ca7ef7a (diff) | |
| parent | ee8ff8768735edc3e013837c4416f819543ddc17 (diff) | |
| download | linux-2e5fc4786b7ad311393a70894c773aa106c6dbb3.tar.gz linux-2e5fc4786b7ad311393a70894c773aa106c6dbb3.tar.bz2 linux-2e5fc4786b7ad311393a70894c773aa106c6dbb3.zip | |
Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree
We are going to queue up a number of patches that depend
on fresh changes in x86/sev - merge in that branch to
reduce the number of conflicts going forward.
Also resolve a current conflict with x86/sev.
Conflicts:
arch/x86/include/asm/coco.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1a33575f98af..63535c8c8b2a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1539,19 +1539,6 @@ config AMD_MEM_ENCRYPT This requires an AMD processor that supports Secure Memory Encryption (SME). -config AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT - bool "Activate AMD Secure Memory Encryption (SME) by default" - depends on AMD_MEM_ENCRYPT - help - Say yes to have system memory encrypted by default if running on - an AMD processor that supports Secure Memory Encryption (SME). - - If set to Y, then the encryption of system memory can be - deactivated with the mem_encrypt=off command line option. - - If set to N, then the encryption of system memory can be - activated with the mem_encrypt=on command line option. - # Common NUMA Features config NUMA bool "NUMA Memory Allocation and Scheduler Support" |