diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-10 09:57:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-10 09:57:42 -0800 |
| commit | aadaa8061189a9e5d8a1327b328453d663e8cbc9 (patch) | |
| tree | 8ca6a12e3512e5f784432991f38c43200e569b76 /arch/x86/include | |
| parent | 73a4c52184141943146ebbf07de4dca27141f21c (diff) | |
| parent | 20e55bc17dd01f13cec0eb17e76e9511b23963ef (diff) | |
| download | linux-aadaa8061189a9e5d8a1327b328453d663e8cbc9.tar.gz linux-aadaa8061189a9e5d8a1327b328453d663e8cbc9.tar.bz2 linux-aadaa8061189a9e5d8a1327b328453d663e8cbc9.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"A handful of fixes:
- Fix an MCE corner case bug/crash found via MCE injection testing
- Fix 5-level paging boot crash
- Fix MCE recovery cache invalidation bug
- Fix regression on Xen guests caused by a recent PMD level mremap
speedup optimization"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Make set_pmd_at() paravirt aware
x86/mm/cpa: Fix set_mce_nospec()
x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 40616e805292..2779ace16d23 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1065,7 +1065,7 @@ static inline void native_set_pte_at(struct mm_struct *mm, unsigned long addr, static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, pmd_t pmd) { - native_set_pmd(pmdp, pmd); + set_pmd(pmdp, pmd); } static inline void set_pud_at(struct mm_struct *mm, unsigned long addr, |