From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Oct 2016 06:38:39 +0000 (-0700)
Subject: Merge branch 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~9208
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4cdf8dbe2d4b3891a9abd9f9ec32acbe58de0cf6;p=mirror_ubuntu-focal-kernel.git

Merge branch 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull uaccess.h prepwork from Al Viro:
 "Preparations to tree-wide switch to use of linux/uaccess.h (which,
  obviously, will allow to start unifying stuff for real). The last step
  there, ie

    PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
    sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
            `git grep -l "$PATT"|grep -v ^include/linux/uaccess.h`

  is not taken here - I would prefer to do it once just before or just
  after -rc1.  However, everything should be ready for it"

* 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  remove a stray reference to asm/uaccess.h in docs
  sparc64: separate extable_64.h, switch elf_64.h to it
  score: separate extable.h, switch module.h to it
  mips: separate extable.h, switch module.h to it
  x86: separate extable.h, switch sections.h to it
  remove stray include of asm/uaccess.h from cacheflush.h
  mn10300: remove a bogus processor.h->uaccess.h include
  xtensa: split uaccess.h into C and asm sides
  bonding: quit messing with IOCTL
  kill __kernel_ds_p off
  mn10300: finish verify_area() off
  frv: move HAVE_ARCH_UNMAPPED_AREA to pgtable.h
  exceptions: detritus removal
---

4cdf8dbe2d4b3891a9abd9f9ec32acbe58de0cf6
diff --cc arch/x86/mm/fault.c
index 4dc13340653e,c0413d5541af..9f72ca3b2669
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -5,7 -5,7 +5,7 @@@
   */
  #include <linux/sched.h>		/* test_thread_flag(), ...	*/
  #include <linux/kdebug.h>		/* oops_begin/end, ...		*/
- #include <linux/extable.h>		/* search_exception_table	*/
 -#include <linux/module.h>		/* search_exception_tables	*/
++#include <linux/extable.h>		/* search_exception_tables	*/
  #include <linux/bootmem.h>		/* max_low_pfn			*/
  #include <linux/kprobes.h>		/* NOKPROBE_SYMBOL, ...		*/
  #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/