From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 10 Nov 2017 07:06:47 +0000 (+0100)
Subject: Merge branch 'linus' into x86/asm, to resolve conflict
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb;p=linux.git

Merge branch 'linus' into x86/asm, to resolve conflict

 Conflicts:
	arch/x86/mm/mem_encrypt.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb
diff --cc arch/x86/mm/mem_encrypt.c
index d247c14469de3,0286327e65fa2..d9a9e9fc75dd7
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@@ -42,11 -40,7 +42,11 @@@ static char sme_cmdline_off[] __initdat
   * section is later cleared.
   */
  u64 sme_me_mask __section(.data) = 0;
- EXPORT_SYMBOL_GPL(sme_me_mask);
+ EXPORT_SYMBOL(sme_me_mask);
 +DEFINE_STATIC_KEY_FALSE(sev_enable_key);
 +EXPORT_SYMBOL_GPL(sev_enable_key);
 +
 +static bool sev_enabled __section(.data);
  
  /* Buffer used for early in-place encryption by BSP, no locking needed */
  static char sme_early_buffer[PAGE_SIZE] __aligned(PAGE_SIZE);