diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 11:46:01 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-11-29 17:49:05 +0100 |
| commit | 8588b01909e0145e5e84f5fe0a5353bd194f205c (patch) | |
| tree | 2b958cb2fca998ae9b0af4fe0e8528f2394df7f0 /arch/powerpc/lib | |
| parent | abb6dd37b6fcb473e8974fac2e9c6cfbaa83b038 (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>
Signed-off-by: Moyster <oysterized@gmail.com>
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/checksum_wrappers_64.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/code-patching.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/sstep.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/usercopy_64.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/lib/checksum_wrappers_64.c b/arch/powerpc/lib/checksum_wrappers_64.c index 08e3a3356..a0cb63fb7 100644 --- a/arch/powerpc/lib/checksum_wrappers_64.c +++ b/arch/powerpc/lib/checksum_wrappers_64.c @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> #include <asm/checksum.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> __wsum csum_and_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr) diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index 17e5b2364..b55bb09fa 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -13,7 +13,7 @@ #include <linux/mm.h> #include <asm/page.h> #include <asm/code-patching.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int patch_instruction(unsigned int *addr, unsigned int instr) diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index 23da15ff7..3148f1fb4 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -14,7 +14,7 @@ #include <linux/prefetch.h> #include <asm/sstep.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cputable.h> extern char system_call_common[]; diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c index 5eea6f3c1..9bd3a3dad 100644 --- a/arch/powerpc/lib/usercopy_64.c +++ b/arch/powerpc/lib/usercopy_64.c @@ -7,7 +7,7 @@ * 2 of the License, or (at your option) any later version. */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> unsigned long copy_from_user(void *to, const void __user *from, unsigned long n) { |