diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 14:46:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 14:46:01 -0500 |
commit | 7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba (patch) | |
tree | 0a6e858d2c9e6e8cd7da1d4268972071fbeb77ca /lib | |
parent | 1dd5c6b15372c7c127c509afa9a816bad5feed3b (diff) |
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
This was entirely automated, using the script by Al:
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)
to do the replacement at the end of the merge window.
Requested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/extable.c | 2 | ||||
-rw-r--r-- | lib/kstrtox.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/extable.c b/lib/extable.c index 0be02ad561e9..62968daa66a9 100644 --- a/lib/extable.c +++ b/lib/extable.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/sort.h> | 14 | #include <linux/sort.h> |
15 | #include <asm/uaccess.h> | 15 | #include <linux/uaccess.h> |
16 | 16 | ||
17 | #ifndef ARCH_HAS_RELATIVE_EXTABLE | 17 | #ifndef ARCH_HAS_RELATIVE_EXTABLE |
18 | #define ex_to_insn(x) ((x)->insn) | 18 | #define ex_to_insn(x) ((x)->insn) |
diff --git a/lib/kstrtox.c b/lib/kstrtox.c index b8e2080c1a47..bf85e05ce858 100644 --- a/lib/kstrtox.c +++ b/lib/kstrtox.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/math64.h> | 17 | #include <linux/math64.h> |
18 | #include <linux/export.h> | 18 | #include <linux/export.h> |
19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
20 | #include <asm/uaccess.h> | 20 | #include <linux/uaccess.h> |
21 | #include "kstrtox.h" | 21 | #include "kstrtox.h" |
22 | 22 | ||
23 | const char *_parse_integer_fixup_radix(const char *s, unsigned int *base) | 23 | const char *_parse_integer_fixup_radix(const char *s, unsigned int *base) |