From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Feb 2021 03:34:09 +0000 (-0800)
Subject: Merge tag 'x86_mm_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae821d2107e378bb086a02afcce82d0f43c29a6f;p=linux.git

Merge tag 'x86_mm_for_v5.12' of git://git./linux/kernel/git/tip/tip

Pull x86 mm cleanups from Borislav Petkov:

 - PTRACE_GETREGS/PTRACE_PUTREGS regset selection cleanup

 - Another initial cleanup - more to follow - to the fault handling
   code.

 - Other minor cleanups and corrections.

* tag 'x86_mm_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
  x86/{fault,efi}: Fix and rename efi_recover_from_page_fault()
  x86/fault: Don't run fixups for SMAP violations
  x86/fault: Don't look for extable entries for SMEP violations
  x86/fault: Rename no_context() to kernelmode_fixup_or_oops()
  x86/fault: Bypass no_context() for implicit kernel faults from usermode
  x86/fault: Split the OOPS code out from no_context()
  x86/fault: Improve kernel-executing-user-memory handling
  x86/fault: Correct a few user vs kernel checks wrt WRUSS
  x86/fault: Document the locking in the fault_signal_pending() path
  x86/fault/32: Move is_f00f_bug() to do_kern_addr_fault()
  x86/fault: Fold mm_fault_error() into do_user_addr_fault()
  x86/fault: Skip the AMD erratum #91 workaround on unaffected CPUs
  x86/fault: Fix AMD erratum #91 errata fixup for user code
  x86/Kconfig: Remove HPET_EMULATE_RTC depends on RTC
  x86/asm: Fixup TASK_SIZE_MAX comment
  x86/ptrace: Clean up PTRACE_GETREGS/PTRACE_PUTREGS regset selection
  x86/vm86/32: Remove VM86_SCREEN_BITMAP support
  x86: Remove definition of DEBUG
  x86/entry: Remove now unused do_IRQ() declaration
  x86/mm: Remove duplicate definition of _PAGE_PAT_LARGE
  ...
---

ae821d2107e378bb086a02afcce82d0f43c29a6f
diff --cc arch/x86/include/asm/efi.h
index 1328b7959b72b,4b7706ddd8b60..627347af343af
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@@ -139,12 -149,10 +139,12 @@@ extern void __init efi_dump_pagetable(v
  extern void __init efi_apply_memmap_quirks(void);
  extern int __init efi_reuse_config(u64 tables, int nr_tables);
  extern void efi_delete_dummy_variable(void);
- extern void efi_recover_from_page_fault(unsigned long phys_addr);
 -extern void efi_switch_mm(struct mm_struct *mm);
+ extern void efi_crash_gracefully_on_page_fault(unsigned long phys_addr);
  extern void efi_free_boot_services(void);
  
 +void efi_enter_mm(void);
 +void efi_leave_mm(void);
 +
  /* kexec external ABI */
  struct efi_setup_data {
  	u64 fw_vendor;