[PATCH] x86/mm: Guard adding .bbs..decrypted section with CONFIG_AMD_MEM_ENCRYPT

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



commit b3f0907c71e0 ("x86/mm: Add .bss..decrypted section to hold shared variables")
usage on some kernels without CONFIG_AMD_MEM_ENCRYPT. Fix it by guarding it
with CONFIG_AMD_MEM_ENCRYP.

Signed-off-by: Lepton Wu <ytht.net@xxxxxxxxx>
---
 arch/x86/kernel/vmlinux.lds.S | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 54a5596adaa6..d39798a23f86 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -69,6 +69,8 @@ jiffies = jiffies_64;
 #define ALIGN_ENTRY_TEXT_BEGIN	. = ALIGN(PMD_SIZE);
 #define ALIGN_ENTRY_TEXT_END	. = ALIGN(PMD_SIZE);
 
+#ifdef CONFIG_AMD_MEM_ENCRYPT
+
 /*
  * This section contains data which will be mapped as decrypted. Memory
  * encryption operates on a page basis. Make this section PMD-aligned
@@ -88,6 +90,12 @@ jiffies = jiffies_64;
 
 #else
 
+#define BSS_DECRYPTED
+
+#endif
+
+#else
+
 #define X86_ALIGN_RODATA_BEGIN
 #define X86_ALIGN_RODATA_END					\
 		. = ALIGN(PAGE_SIZE);				\
-- 
2.42.0.869.gea05f2083d-goog





[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux