diff options
author | Linus Torvalds | 2019-05-16 20:26:37 +0200 |
---|---|---|
committer | Linus Torvalds | 2019-05-16 20:26:37 +0200 |
commit | 27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc (patch) | |
tree | 321883ef69804066ccdc90e3ca1c63ca0f7bcd0c /arch/openrisc/mm/init.c | |
parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | asm-generic: optimize generic uaccess for 8-byte loads and stores (diff) | |
download | kernel-qcow2-linux-27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc.tar.gz kernel-qcow2-linux-27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc.tar.xz kernel-qcow2-linux-27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc.zip |
Merge tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/openrisc/mm/init.c')
-rw-r--r-- | arch/openrisc/mm/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c index abe87e54e231..e63cb4a91a3e 100644 --- a/arch/openrisc/mm/init.c +++ b/arch/openrisc/mm/init.c @@ -32,7 +32,6 @@ #include <linux/blkdev.h> /* for initrd_* */ #include <linux/pagemap.h> -#include <asm/segment.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> #include <asm/dma.h> |