From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 May 2019 18:26:37 +0000 (-0700)
Subject: Merge tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd... 
X-Git-Tag: v5.2-rc1~36
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc;p=linux-2.6-block.git

Merge tag 'asm-generic-nommu' of git://git./linux/kernel/git/arnd/asm-generic

Pull nommu generic uaccess updates from Arnd Bergmann:
 "asm-generic: kill <asm/segment.h> and improve nommu generic uaccess helpers

  Christoph Hellwig writes:

     This is a series doing two somewhat interwinded things. It improves
     the asm-generic nommu uaccess helper to optionally be entirely
     generic and not require any arch helpers for the actual uaccess.
     For the generic uaccess.h to actually be generically useful I also
     had to kill off the mess we made of <asm/segment.h>, which really
     shouldn't exist on most architectures"

* tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: optimize generic uaccess for 8-byte loads and stores
  asm-generic: provide entirely generic nommu uaccess
  arch: mostly remove <asm/segment.h>
  asm-generic: don't include <asm/segment.h> from <asm/uaccess.h>
---

27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc
diff --cc arch/arm/include/asm/Kbuild
index 0b2ecc98e086,1465d4609929..60de9d13181a
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@@ -13,10 -12,11 +13,9 @@@ generic-y += mmiowb.
  generic-y += msi.h
  generic-y += parport.h
  generic-y += preempt.h
 -generic-y += rwsem.h
  generic-y += seccomp.h
- generic-y += segment.h
  generic-y += serial.h
  generic-y += simd.h
 -generic-y += sizes.h
  generic-y += trace_clock.h
  
  generated-y += mach-types.h
diff --cc arch/arm64/include/asm/Kbuild
index 9e977dedf193,fd9574e8f31c..1de6e05ce48b
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@@ -17,9 -16,10 +17,8 @@@ generic-y += mmiowb.
  generic-y += msi.h
  generic-y += qrwlock.h
  generic-y += qspinlock.h
- generic-y += segment.h
 -generic-y += rwsem.h
  generic-y += serial.h
  generic-y += set_memory.h
 -generic-y += sizes.h
  generic-y += switch_to.h
  generic-y += trace_clock.h
  generic-y += unaligned.h
diff --cc arch/hexagon/include/asm/Kbuild
index 4a3d72f76ea2,75658fea8bfc..84bb1ed1b931
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@@ -28,10 -26,11 +28,9 @@@ generic-y += mmiowb.
  generic-y += pci.h
  generic-y += percpu.h
  generic-y += preempt.h
 -generic-y += rwsem.h
  generic-y += sections.h
- generic-y += segment.h
  generic-y += serial.h
  generic-y += shmparam.h
 -generic-y += sizes.h
  generic-y += topology.h
  generic-y += trace_clock.h
  generic-y += unaligned.h
diff --cc arch/nds32/include/asm/Kbuild
index f67a327777b5,668d3094921f..d8ce778d0640
--- a/arch/nds32/include/asm/Kbuild
+++ b/arch/nds32/include/asm/Kbuild
@@@ -37,8 -36,8 +37,7 @@@ generic-y += pci.
  generic-y += percpu.h
  generic-y += preempt.h
  generic-y += sections.h
- generic-y += segment.h
  generic-y += serial.h
 -generic-y += sizes.h
  generic-y += switch_to.h
  generic-y += timex.h
  generic-y += topology.h
diff --cc arch/unicore32/include/asm/Kbuild
index c93dc6478cb2,a6e4e06caa0a..5fe2426bb7a5
--- a/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@@ -28,9 -26,9 +28,8 @@@ generic-y += parport.
  generic-y += percpu.h
  generic-y += preempt.h
  generic-y += sections.h
- generic-y += segment.h
  generic-y += serial.h
  generic-y += shmparam.h
 -generic-y += sizes.h
  generic-y += syscalls.h
  generic-y += topology.h
  generic-y += trace_clock.h