diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:05:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:05:30 +0100 |
| commit | d04fdafc066fed10cc9610b2f36f1d0ff0327864 (patch) | |
| tree | f3365e4bf1064737a36e5488641a14e54fc173bc /arch | |
| parent | 7980f029d05d8a3b4634aa6952e1ec51bce9431f (diff) | |
| parent | c5e260890d5fd6687287f2b532c738a359a61a82 (diff) | |
| download | linux-stable-d04fdafc066fed10cc9610b2f36f1d0ff0327864.tar.gz linux-stable-d04fdafc066fed10cc9610b2f36f1d0ff0327864.tar.bz2 linux-stable-d04fdafc066fed10cc9610b2f36f1d0ff0327864.zip | |
Merge branch 'x86/mm' into x86/asm, to merge branches
Most of x86/mm is already in x86/asm, so merge the rest too.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/mem_encrypt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index 5049b8bad3e7..d247c14469de 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -69,7 +69,6 @@ static void __init __sme_early_enc_dec(resource_size_t paddr, if (!sme_me_mask) return; - local_flush_tlb(); wbinvd(); /* |