diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-04-23 18:38:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-04-23 21:51:39 +0200 |
| commit | 737d42f75e943fd884ad13acb6d3ee3aff3dcd30 (patch) | |
| tree | b6f1e8d4103699e9b6cb299c025785c79f2dcfee | |
| parent | Linux 5.1-rc1 (diff) | |
| download | linux-737d42f75e943fd884ad13acb6d3ee3aff3dcd30.tar.xz linux-737d42f75e943fd884ad13acb6d3ee3aff3dcd30.zip | |
asm-generic: don't include <asm/segment.h> from <asm/uaccess.h>
<asm/segment.h> is an odd x86 legacy that we shouldn't force on other
architectures. arc used it to bring in mm_context_t, but we can do
that inside the arc code easily.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arc/include/asm/uaccess.h | 1 | ||||
| -rw-r--r-- | include/asm-generic/uaccess.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arc/include/asm/uaccess.h b/arch/arc/include/asm/uaccess.h index eabc3efa6c6d..526418543379 100644 --- a/arch/arc/include/asm/uaccess.h +++ b/arch/arc/include/asm/uaccess.h @@ -742,6 +742,7 @@ extern long arc_strnlen_user_noinline(const char __user *src, long n); #endif +#include <asm/segment.h> #include <asm-generic/uaccess.h> #endif diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h index b3d2241e03f8..aac336831204 100644 --- a/include/asm-generic/uaccess.h +++ b/include/asm-generic/uaccess.h @@ -9,8 +9,6 @@ */ #include <linux/string.h> -#include <asm/segment.h> - #define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) #ifndef KERNEL_DS |