x86/sev: Drop redundant and potentially misleading 'sev_enabled'

[sfrench/cifs-2.6.git] / arch / x86 / mm / mem_encrypt.c

diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index ae78cef7998023e7d7520dab74e0153b543af8f4..a2d4925952130812ad53ee0b585c6e962ce83a3b 100644 (file)
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -44,8 +44,6 @@ EXPORT_SYMBOL(sme_me_mask);
 DEFINE_STATIC_KEY_FALSE(sev_enable_key);
 EXPORT_SYMBOL_GPL(sev_enable_key);
 
-bool sev_enabled __section(".data");
-
 /* Buffer used for early in-place encryption by BSP, no locking needed */
 static char sme_early_buffer[PAGE_SIZE] __initdata __aligned(PAGE_SIZE);
 
@@ -373,14 +371,14 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size)
  * up under SME the trampoline area cannot be encrypted, whereas under SEV
  * the trampoline area must be encrypted.
  */
-bool sme_active(void)
+bool sev_active(void)
 {
-       return sme_me_mask && !sev_enabled;
+       return sev_status & MSR_AMD64_SEV_ENABLED;
 }
 
-bool sev_active(void)
+bool sme_active(void)
 {
-       return sev_status & MSR_AMD64_SEV_ENABLED;
+       return sme_me_mask && !sev_active();
 }
 EXPORT_SYMBOL_GPL(sev_active);