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/x86/include | |
| 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/x86/include')
| -rw-r--r-- | arch/x86/include/asm/checksum_32.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/checksum_64.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/fpu-internal.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/sections.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/xen/page.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h index f50de6951..77db3d30c 100644 --- a/arch/x86/include/asm/checksum_32.h +++ b/arch/x86/include/asm/checksum_32.h @@ -3,7 +3,7 @@ #include <linux/in6.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * computes the checksum of a memory block at buff, length len, diff --git a/arch/x86/include/asm/checksum_64.h b/arch/x86/include/asm/checksum_64.h index 9bfdc4162..5bed8224a 100644 --- a/arch/x86/include/asm/checksum_64.h +++ b/arch/x86/include/asm/checksum_64.h @@ -8,7 +8,7 @@ */ #include <linux/compiler.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> /** diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h index 1b2fc5cf1..a3a04fbf4 100644 --- a/arch/x86/include/asm/fpu-internal.h +++ b/arch/x86/include/asm/fpu-internal.h @@ -19,7 +19,7 @@ #include <asm/processor.h> #include <asm/sigcontext.h> #include <asm/user.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/xsave.h> #include <asm/smap.h> diff --git a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sections.h index 0a5242428..5f854da7a 100644 --- a/arch/x86/include/asm/sections.h +++ b/arch/x86/include/asm/sections.h @@ -2,7 +2,7 @@ #define _ASM_X86_SECTIONS_H #include <asm-generic/sections.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern char __brk_base[], __brk_limit[]; extern struct exception_table_entry __stop___ex_table[]; diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h index b913915e8..344121d9f 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h @@ -7,7 +7,7 @@ #include <linux/pfn.h> #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> |