diff options
author | 2017-11-10 08:06:47 +0100 | |
---|---|---|
committer | 2017-11-10 08:06:47 +0100 | |
commit | 91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb (patch) | |
tree | dbea28420ff33aca40be8d3cd901305064b4ea24 /arch/x86/mm/mem_encrypt.c | |
parent | Merge branch 'x86/mm' into x86/asm, to merge branches (diff) | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
download | linux-91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb.tar.gz linux-91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb.tar.bz2 linux-91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb.zip |
Merge branch 'linus' into x86/asm, to resolve conflict
Conflicts:
arch/x86/mm/mem_encrypt.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/mem_encrypt.c')
-rw-r--r-- | arch/x86/mm/mem_encrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index d247c14469de..d9a9e9fc75dd 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -42,7 +42,7 @@ static char sme_cmdline_off[] __initdata = "off"; * 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); |