Commit ae821d21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_mm_for_v5.12' of git://git.kernel.org/pub/scm/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
  ...
parents 1255f440 40c1fa52

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ config HPET_TIMER 


config HPET_EMULATE_RTC

	def_bool y

	depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)

	depends on HPET_TIMER && (RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)



config APB_TIMER

	def_bool y if X86_INTEL_MID

arch/x86/include/asm/efi.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ extern void __init efi_dump_pagetable(void); 
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_crash_gracefully_on_page_fault(unsigned long phys_addr);

extern void efi_free_boot_services(void);



void efi_enter_mm(void);

arch/x86/include/asm/irq.h

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ extern void native_init_IRQ(void); 


extern void __handle_irq(struct irq_desc *desc, struct pt_regs *regs);



extern __visible void do_IRQ(struct pt_regs *regs, unsigned long vector);



extern void init_ISA_irqs(void);



extern void __init init_IRQ(void);

arch/x86/include/asm/page_64_types.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 * On Intel CPUs, if a SYSCALL instruction is at the highest canonical

 * address, then that syscall will enter the kernel with a

 * non-canonical return address, and SYSRET will explode dangerously.

 * We avoid this particular problem by preventing anything executable

 * We avoid this particular problem by preventing anything

 * from being mapped at the maximum canonical address.

 *

 * On AMD CPUs in the Ryzen family, there's a nasty bug in which the

arch/x86/include/asm/pgtable_types.h

+0 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ enum page_cache_mode { 
#define __pgprot(x)		((pgprot_t) { (x) } )

#define __pg(x)			__pgprot(x)



#define _PAGE_PAT_LARGE		(_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)



#define PAGE_NONE	     __pg(   0|   0|   0|___A|   0|   0|   0|___G)

#define PAGE_SHARED	     __pg(__PP|__RW|_USR|___A|__NX|   0|   0|   0)

#define PAGE_SHARED_EXEC     __pg(__PP|__RW|_USR|___A|   0|   0|   0|   0)