diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-16 20:26:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-16 20:26:37 +0200 |
| commit | 27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc (patch) | |
| tree | 321883ef69804066ccdc90e3ca1c63ca0f7bcd0c /arch/s390 | |
| 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 | linux-27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc.tar.xz 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/s390')
| -rw-r--r-- | arch/s390/include/asm/segment.h | 5 | ||||
| -rw-r--r-- | arch/s390/kernel/ptrace.c | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/include/asm/segment.h b/arch/s390/include/asm/segment.h deleted file mode 100644 index 97a0582b8d0f..000000000000 --- a/arch/s390/include/asm/segment.h +++ /dev/null @@ -1,5 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_SEGMENT_H -#define _ASM_SEGMENT_H - -#endif diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index cd3df5514552..ad71132374f0 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c @@ -24,7 +24,6 @@ #include <linux/seccomp.h> #include <linux/compat.h> #include <trace/syscall.h> -#include <asm/segment.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> |