From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Mar 2020 18:04:05 +0000 (-0700)
Subject: Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fdf5563a720004199324371c08071b8ea27bd994;p=linux.git

Merge branch 'x86-cleanups-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
 "This topic tree contains more commits than usual:

   - most of it are uaccess cleanups/reorganization by Al

   - there's a bunch of prototype declaration (--Wmissing-prototypes)
     cleanups

   - misc other cleanups all around the map"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
  x86/mm/set_memory: Fix -Wmissing-prototypes warnings
  x86/efi: Add a prototype for efi_arch_mem_reserve()
  x86/mm: Mark setup_emu2phys_nid() static
  x86/jump_label: Move 'inline' keyword placement
  x86/platform/uv: Add a missing prototype for uv_bau_message_interrupt()
  kill uaccess_try()
  x86: unsafe_put-style macro for sigmask
  x86: x32_setup_rt_frame(): consolidate uaccess areas
  x86: __setup_rt_frame(): consolidate uaccess areas
  x86: __setup_frame(): consolidate uaccess areas
  x86: setup_sigcontext(): list user_access_{begin,end}() into callers
  x86: get rid of put_user_try in __setup_rt_frame() (both 32bit and 64bit)
  x86: ia32_setup_rt_frame(): consolidate uaccess areas
  x86: ia32_setup_frame(): consolidate uaccess areas
  x86: ia32_setup_sigcontext(): lift user_access_{begin,end}() into the callers
  x86/alternatives: Mark text_poke_loc_init() static
  x86/cpu: Fix a -Wmissing-prototypes warning for init_ia32_feat_ctl()
  x86/mm: Drop pud_mknotpresent()
  x86: Replace setup_irq() by request_irq()
  x86/configs: Slightly reduce defconfigs
  ...
---

fdf5563a720004199324371c08071b8ea27bd994
diff --cc Documentation/x86/exception-tables.rst
index 81a393867f100,514f51829da77..de58110c5ffdb
--- a/Documentation/x86/exception-tables.rst
+++ b/Documentation/x86/exception-tables.rst
@@@ -340,21 -337,4 +340,15 @@@ pointer which points to one of
       entry->insn. It is used to distinguish page faults from machine
       check.
  
- 3) ``int ex_handler_ext(const struct exception_table_entry *fixup)``
-      This case is used for uaccess_err ... we need to set a flag
-      in the task structure. Before the handler functions existed this
-      case was handled by adding a large offset to the fixup to tag
-      it as special.
- 
  More functions can easily be added.
 +
 +CONFIG_BUILDTIME_TABLE_SORT allows the __ex_table section to be sorted post
 +link of the kernel image, via a host utility scripts/sorttable. It will set the
 +symbol main_extable_sort_needed to 0, avoiding sorting the __ex_table section
 +at boot time. With the exception table sorted, at runtime when an exception
 +occurs we can quickly lookup the __ex_table entry via binary search.
 +
 +This is not just a boot time optimization, some architectures require this
 +table to be sorted in order to handle exceptions relatively early in the boot
 +process. For example, i386 makes use of this form of exception handling before
 +paging support is even enabled!
diff --cc arch/x86/include/asm/sighandling.h
index bd26834724e52,35e0b579ffcbe..65e667279e0f3
--- a/arch/x86/include/asm/sighandling.h
+++ b/arch/x86/include/asm/sighandling.h
@@@ -14,7 -14,9 +14,5 @@@
  			 X86_EFLAGS_CF | X86_EFLAGS_RF)
  
  void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
- int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
- 		     struct pt_regs *regs, unsigned long mask);
  
 -#ifdef CONFIG_X86_X32_ABI
 -asmlinkage long sys32_x32_rt_sigreturn(void);
 -#endif
 -
  #endif /* _ASM_X86_SIGHANDLING_H */
diff --cc include/linux/efi.h
index abfc98e4dfe1c,e4b28ae1ba61e..251f1f783cdf7
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@@ -1243,4 -1701,8 +1243,6 @@@ struct linux_efi_memreserve 
  #define EFI_MEMRESERVE_COUNT(size) (((size) - sizeof(struct linux_efi_memreserve)) \
  	/ sizeof(((struct linux_efi_memreserve *)0)->entry[0]))
  
 -void efi_pci_disable_bridge_busmaster(void);
 -
+ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);
+ 
  #endif /* _LINUX_EFI_H */