diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-02-26 08:39:26 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-02-26 08:41:15 +0100 |
commit | 3f7df3efeb415610d27aecc282ff96d4a22f0168 (patch) | |
tree | 0f66382746a1311043a25320243ff5f4b10c282e /arch/x86/include/asm/page_64.h | |
parent | 39b9552281abfcdfc54162897018890dafe7ffef (diff) | |
parent | 4a3928c6f8a53fa1aed28ccba227742486e8ddcb (diff) | |
download | linux-stable-3f7df3efeb415610d27aecc282ff96d4a22f0168.tar.gz linux-stable-3f7df3efeb415610d27aecc282ff96d4a22f0168.tar.bz2 linux-stable-3f7df3efeb415610d27aecc282ff96d4a22f0168.zip |
Merge tag 'v4.16-rc3' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/page_64.h')
-rw-r--r-- | arch/x86/include/asm/page_64.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index 096378650142..e7f7a4f7375a 100644 --- a/arch/x86/include/asm/page_64.h +++ b/arch/x86/include/asm/page_64.h @@ -56,10 +56,6 @@ static inline void clear_page(void *page) void copy_page(void *to, void *from); -#ifdef CONFIG_X86_MCE -#define arch_unmap_kpfn arch_unmap_kpfn -#endif - #endif /* !__ASSEMBLY__ */ #ifdef CONFIG_X86_VSYSCALL_EMULATION |