aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/pmem.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm/pmem.h')
-rw-r--r--arch/x86/include/asm/pmem.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pmem.h b/arch/x86/include/asm/pmem.h
index 643eba42d620..2c1ebeb4d737 100644
--- a/arch/x86/include/asm/pmem.h
+++ b/arch/x86/include/asm/pmem.h
@@ -46,10 +46,7 @@ static inline void arch_memcpy_to_pmem(void *dst, const void *src, size_t n)
46 46
47static inline int arch_memcpy_from_pmem(void *dst, const void *src, size_t n) 47static inline int arch_memcpy_from_pmem(void *dst, const void *src, size_t n)
48{ 48{
49 if (static_cpu_has(X86_FEATURE_MCE_RECOVERY)) 49 return memcpy_mcsafe(dst, src, n);
50 return memcpy_mcsafe(dst, src, n);
51 memcpy(dst, src, n);
52 return 0;
53} 50}
54 51
55/** 52/**