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 | |
| 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>
1635 files changed, 1652 insertions, 1652 deletions
diff --git a/arch/alpha/boot/misc.c b/arch/alpha/boot/misc.c index 3ff9a957a..1b568ed74 100644 --- a/arch/alpha/boot/misc.c +++ b/arch/alpha/boot/misc.c @@ -21,7 +21,7 @@ #include <linux/kernel.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define memzero(s,n) memset ((s),0,(n)) #define puts srm_printk diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c index 89566b346..e259bd846 100644 --- a/arch/alpha/kernel/alpha_ksyms.c +++ b/arch/alpha/kernel/alpha_ksyms.c @@ -7,7 +7,7 @@ #include <linux/module.h> #include <asm/console.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/checksum.h> #include <asm/fpu.h> #include <asm/machvec.h> diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c index 7b2be251c..ca43bdda2 100644 --- a/arch/alpha/kernel/irq.c +++ b/arch/alpha/kernel/irq.c @@ -27,7 +27,7 @@ #include <linux/bitops.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> volatile unsigned long irq_err_count; DEFINE_PER_CPU(unsigned long, irq_pmi_count); diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 1402fcc11..4b6e03d69 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -39,7 +39,7 @@ #include <asm/fpu.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sysinfo.h> #include <asm/thread_info.h> #include <asm/hwrpb.h> diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index ab80a80d3..9d7134835 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c @@ -31,7 +31,7 @@ #include <linux/rcupdate.h> #include <asm/reg.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/pgtable.h> #include <asm/hwrpb.h> diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c index 2a4a80ff4..23073dff8 100644 --- a/arch/alpha/kernel/ptrace.c +++ b/arch/alpha/kernel/ptrace.c @@ -15,7 +15,7 @@ #include <linux/signal.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/fpu.h> diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 9e3107cc5..47ec28f8a 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -53,7 +53,7 @@ static struct notifier_block alpha_panic_block = { INT_MAX /* try to do it first */ }; -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/hwrpb.h> #include <asm/dma.h> diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c index 6cec2881a..9ba63025e 100644 --- a/arch/alpha/kernel/signal.c +++ b/arch/alpha/kernel/signal.c @@ -22,7 +22,7 @@ #include <linux/syscalls.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sigcontext.h> #include <asm/ucontext.h> diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c index ffe996a54..705ae12ac 100644 --- a/arch/alpha/kernel/srm_env.c +++ b/arch/alpha/kernel/srm_env.c @@ -35,7 +35,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <asm/console.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/machvec.h> #define BASE_DIR "srm_environment" /* Subdir in /proc/ */ diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c index 6f01d9ad7..23961dffc 100644 --- a/arch/alpha/kernel/srmcons.c +++ b/arch/alpha/kernel/srmcons.c @@ -18,7 +18,7 @@ #include <linux/tty_flip.h> #include <asm/console.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static DEFINE_SPINLOCK(srmcons_callback_lock); diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index e336694ca..931d8b185 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c @@ -43,7 +43,7 @@ #include <linux/profile.h> #include <linux/irq_work.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/hwrpb.h> #include <asm/rtc.h> diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index be1fba334..02734ee42 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -19,7 +19,7 @@ #include <linux/ratelimit.h> #include <asm/gentrap.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> #include <asm/sysinfo.h> #include <asm/hwrpb.h> diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c index 40736da9b..74a0e2e58 100644 --- a/arch/alpha/lib/csum_partial_copy.c +++ b/arch/alpha/lib/csum_partial_copy.c @@ -11,7 +11,7 @@ #include <linux/types.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define ldq_u(x,y) \ diff --git a/arch/alpha/math-emu/math.c b/arch/alpha/math-emu/math.c index 58c2669a1..fa5ae0ad8 100644 --- a/arch/alpha/math-emu/math.c +++ b/arch/alpha/math-emu/math.c @@ -3,7 +3,7 @@ #include <linux/kernel.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sfp-util.h" #include <math-emu/soft-fp.h> diff --git a/arch/alpha/mm/extable.c b/arch/alpha/mm/extable.c index 813c9b63c..0e9001853 100644 --- a/arch/alpha/mm/extable.c +++ b/arch/alpha/mm/extable.c @@ -4,7 +4,7 @@ #include <linux/module.h> #include <linux/sort.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static inline unsigned long ex_to_addr(const struct exception_table_entry *x) { diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 9d0ac091a..4a447d7c4 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -24,7 +24,7 @@ #include <linux/interrupt.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *); diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 0ba85ee4a..00c5bb32b 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c @@ -22,7 +22,7 @@ #include <linux/vmalloc.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> #include <asm/hwrpb.h> diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c index b1b89882b..a19b896e1 100644 --- a/arch/arm/kernel/swp_emulate.c +++ b/arch/arm/kernel/swp_emulate.c @@ -28,7 +28,7 @@ #include <asm/opcodes.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Error-checking SWP macros implemented using ldrex{b}/strex{b} diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index ef1703b95..c0a73e1a0 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -31,7 +31,7 @@ #define CREATE_TRACE_POINTS #include "trace.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ptrace.h> #include <asm/mman.h> #include <asm/tlbflush.h> diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c index 152d03612..6a1b0c04e 100644 --- a/arch/arm/kvm/guest.c +++ b/arch/arm/kvm/guest.c @@ -23,7 +23,7 @@ #include <linux/vmalloc.h> #include <linux/fs.h> #include <asm/cputype.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/kvm.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> diff --git a/arch/arm/mach-iop13xx/irq.c b/arch/arm/mach-iop13xx/irq.c index bc739701c..d9ccc4ca4 100644 --- a/arch/arm/mach-iop13xx/irq.c +++ b/arch/arm/mach-iop13xx/irq.c @@ -20,7 +20,7 @@ #include <linux/interrupt.h> #include <linux/list.h> #include <linux/sysctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mach/irq.h> #include <asm/irq.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index d7223b3b8..142651ba2 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c @@ -34,7 +34,7 @@ #include <mach/udc.h> #include <mach/hardware.h> #include <mach/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/page.h> #include <asm/irq.h> diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c index 85883b2e0..586d8baee 100644 --- a/arch/arm/mach-rpc/dma.c +++ b/arch/arm/mach-rpc/dma.c @@ -20,7 +20,7 @@ #include <asm/fiq.h> #include <asm/irq.h> #include <mach/hardware.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mach/dma.h> #include <asm/hardware/iomd.h> diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 837a2d52e..8e522a1f0 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c @@ -25,7 +25,7 @@ #include <mach/hardware.h> #include <asm/irq.h> #include <asm/sched_clock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> #include <mach/time.h> diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 3d9f4e66e..e19a59280 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -25,7 +25,7 @@ #include <asm/fpsimd.h> #include <asm/signal32.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> struct compat_sigcontext { diff --git a/arch/arm64/kernel/swp_emulate.c b/arch/arm64/kernel/swp_emulate.c index 508fd2edb..f376937d9 100644 --- a/arch/arm64/kernel/swp_emulate.c +++ b/arch/arm64/kernel/swp_emulate.c @@ -28,7 +28,7 @@ #include <asm/opcodes.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/system_misc.h> #include <linux/debugfs.h> diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c index 7c6cf14f0..0d05fd095 100644 --- a/arch/avr32/kernel/avr32_ksyms.c +++ b/arch/avr32/kernel/avr32_ksyms.c @@ -12,7 +12,7 @@ #include <linux/module.h> #include <asm/checksum.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * GCC functions diff --git a/arch/avr32/kernel/ptrace.c b/arch/avr32/kernel/ptrace.c index 4aedcab7c..a89b89327 100644 --- a/arch/avr32/kernel/ptrace.c +++ b/arch/avr32/kernel/ptrace.c @@ -17,7 +17,7 @@ #include <linux/notifier.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ocd.h> #include <asm/mmu_context.h> #include <linux/kdebug.h> diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c index b80c0b3d2..bf541f363 100644 --- a/arch/avr32/kernel/signal.c +++ b/arch/avr32/kernel/signal.c @@ -17,7 +17,7 @@ #include <linux/unistd.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ucontext.h> #include <asm/syscalls.h> diff --git a/arch/avr32/mm/cache.c b/arch/avr32/mm/cache.c index 6a46ecd56..db362f07d 100644 --- a/arch/avr32/mm/cache.c +++ b/arch/avr32/mm/cache.c @@ -12,7 +12,7 @@ #include <asm/cacheflush.h> #include <asm/cachectl.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/syscalls.h> /* diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c index d223a8b57..4e5164771 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c @@ -18,7 +18,7 @@ #include <asm/mmu_context.h> #include <asm/sysreg.h> #include <asm/tlb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_KPROBES static inline int notify_page_fault(struct pt_regs *regs, int trap) diff --git a/arch/blackfin/kernel/bfin_dma.c b/arch/blackfin/kernel/bfin_dma.c index 4a32f2dd5..9d3eb0cf8 100644 --- a/arch/blackfin/kernel/bfin_dma.c +++ b/arch/blackfin/kernel/bfin_dma.c @@ -19,7 +19,7 @@ #include <asm/blackfin.h> #include <asm/cacheflush.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/early_printk.h> /* diff --git a/arch/blackfin/kernel/kgdb_test.c b/arch/blackfin/kernel/kgdb_test.c index 18ab004ae..b8b785dc4 100644 --- a/arch/blackfin/kernel/kgdb_test.c +++ b/arch/blackfin/kernel/kgdb_test.c @@ -12,7 +12,7 @@ #include <linux/proc_fs.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/blackfin.h> diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c index 4489efc52..0188c933b 100644 --- a/arch/blackfin/kernel/module.c +++ b/arch/blackfin/kernel/module.c @@ -14,7 +14,7 @@ #include <linux/kernel.h> #include <asm/dma.h> #include <asm/cacheflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Transfer the section to the L1 memory */ int diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c index b74ccb5a7..e89ea98e8 100644 --- a/arch/c6x/mm/init.c +++ b/arch/c6x/mm/init.c @@ -18,7 +18,7 @@ #include <linux/initrd.h> #include <asm/sections.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * ZERO_PAGE is a special page that is used for zero-initialized diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c index 5047a3304..186d724d5 100644 --- a/arch/cris/arch-v10/drivers/eeprom.c +++ b/arch/cris/arch-v10/drivers/eeprom.c @@ -29,7 +29,7 @@ #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/wait.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "i2c.h" #define D(x) diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c index a1c498d18..a1e5a4d44 100644 --- a/arch/cris/arch-v10/drivers/sync_serial.c +++ b/arch/cris/arch-v10/drivers/sync_serial.c @@ -26,7 +26,7 @@ #include <asm/dma.h> #include <asm/io.h> #include <arch/svinto.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sync_serial.h> #include <arch/io_interface_mux.h> diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c index bfddfb994..eca94c7d5 100644 --- a/arch/cris/arch-v10/kernel/ptrace.c +++ b/arch/cris/arch-v10/kernel/ptrace.c @@ -12,7 +12,7 @@ #include <linux/signal.h> #include <linux/security.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/processor.h> diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index 61ce6273a..1755e6410 100644 --- a/arch/cris/arch-v10/kernel/signal.c +++ b/arch/cris/arch-v10/kernel/signal.c @@ -26,7 +26,7 @@ #include <asm/processor.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <arch/system.h> #define DEBUG_SIG 0 diff --git a/arch/cris/arch-v10/kernel/traps.c b/arch/cris/arch-v10/kernel/traps.c index 7001beda7..96d004fe9 100644 --- a/arch/cris/arch-v10/kernel/traps.c +++ b/arch/cris/arch-v10/kernel/traps.c @@ -9,7 +9,7 @@ */ #include <linux/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <arch/sv_addr_ag.h> #include <arch/system.h> diff --git a/arch/cris/arch-v10/lib/usercopy.c b/arch/cris/arch-v10/lib/usercopy.c index b0a608da7..969d35fc6 100644 --- a/arch/cris/arch-v10/lib/usercopy.c +++ b/arch/cris/arch-v10/lib/usercopy.c @@ -8,7 +8,7 @@ * Pieces used from memcpy, originally by Kenny Ranerup long time ago. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Asm:s have been tweaked (within the domain of correctness) to give satisfactory results for "gcc version 2.96 20000427 (experimental)". diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c index ed60588f8..75210cbe6 100644 --- a/arch/cris/arch-v10/mm/fault.c +++ b/arch/cris/arch-v10/mm/fault.c @@ -11,7 +11,7 @@ */ #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <arch/svinto.h> #include <asm/mmu_context.h> diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c index 877da1908..f40efae48 100644 --- a/arch/cris/arch-v32/drivers/cryptocop.c +++ b/arch/cris/arch-v32/drivers/cryptocop.c @@ -14,7 +14,7 @@ #include <linux/spinlock.h> #include <linux/stddef.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/atomic.h> diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c index f085229cf..c79ff3d45 100644 --- a/arch/cris/arch-v32/kernel/ptrace.c +++ b/arch/cris/arch-v32/kernel/ptrace.c @@ -12,7 +12,7 @@ #include <linux/signal.h> #include <linux/security.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/processor.h> diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 01d1375c9..6334eebb5 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c @@ -18,7 +18,7 @@ #include <asm/io.h> #include <asm/processor.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <arch/ptrace.h> #include <arch/hwregs/cpu_vect.h> diff --git a/arch/cris/arch-v32/kernel/traps.c b/arch/cris/arch-v32/kernel/traps.c index 8bbe09c93..d79666aef 100644 --- a/arch/cris/arch-v32/kernel/traps.c +++ b/arch/cris/arch-v32/kernel/traps.c @@ -4,7 +4,7 @@ #include <linux/ptrace.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <hwregs/supp_reg.h> #include <hwregs/intr_vect_defs.h> #include <asm/irq.h> diff --git a/arch/cris/arch-v32/lib/usercopy.c b/arch/cris/arch-v32/lib/usercopy.c index 0b5b70d5f..7babd6c63 100644 --- a/arch/cris/arch-v32/lib/usercopy.c +++ b/arch/cris/arch-v32/lib/usercopy.c @@ -8,7 +8,7 @@ * Pieces used from memcpy, originally by Kenny Ranerup long time ago. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Asm:s have been tweaked (within the domain of correctness) to give satisfactory results for "gcc version 3.2.1 Axis release R53/1.53-v32". diff --git a/arch/cris/kernel/crisksyms.c b/arch/cris/kernel/crisksyms.c index 5868cee20..a6752b8a9 100644 --- a/arch/cris/kernel/crisksyms.c +++ b/arch/cris/kernel/crisksyms.c @@ -10,7 +10,7 @@ #include <linux/tty.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> #include <asm/delay.h> diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c index b78498eb0..50a7dd451 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c @@ -14,7 +14,7 @@ #include <linux/atomic.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <linux/module.h> #include <linux/spinlock.h> diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c index cd9f15b92..ad56b37f8 100644 --- a/arch/cris/kernel/profile.c +++ b/arch/cris/kernel/profile.c @@ -5,7 +5,7 @@ #include <linux/slab.h> #include <linux/types.h> #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define SAMPLE_BUFFER_SIZE 8192 diff --git a/arch/cris/kernel/ptrace.c b/arch/cris/kernel/ptrace.c index 58d44ee1a..788b1234a 100644 --- a/arch/cris/kernel/ptrace.c +++ b/arch/cris/kernel/ptrace.c @@ -18,7 +18,7 @@ #include <linux/user.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/processor.h> diff --git a/arch/cris/kernel/sys_cris.c b/arch/cris/kernel/sys_cris.c index 7aa036ec7..8febb032f 100644 --- a/arch/cris/kernel/sys_cris.c +++ b/arch/cris/kernel/sys_cris.c @@ -23,7 +23,7 @@ #include <linux/file.h> #include <linux/ipc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/segment.h> asmlinkage long diff --git a/arch/cris/kernel/traps.c b/arch/cris/kernel/traps.c index 0ffda7373..1a20e18ae 100644 --- a/arch/cris/kernel/traps.c +++ b/arch/cris/kernel/traps.c @@ -16,7 +16,7 @@ #include <linux/module.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <arch/system.h> extern void arch_enable_nmi(void); diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index 2686a7aa8..404245b40 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c @@ -8,7 +8,7 @@ #include <linux/interrupt.h> #include <linux/module.h> #include <linux/wait.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <arch/system.h> extern int find_fixup_code(struct pt_regs *); diff --git a/arch/frv/include/asm/futex.h b/arch/frv/include/asm/futex.h index 4bea27f50..2e1da71e2 100644 --- a/arch/frv/include/asm/futex.h +++ b/arch/frv/include/asm/futex.h @@ -5,7 +5,7 @@ #include <linux/futex.h> #include <asm/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr); diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c index 2239346fa..93513e4cc 100644 --- a/arch/frv/kernel/irq.c +++ b/arch/frv/kernel/irq.c @@ -28,7 +28,7 @@ #include <linux/atomic.h> #include <asm/io.h> #include <asm/smp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/delay.h> #include <asm/irq.h> diff --git a/arch/frv/kernel/pm-mb93093.c b/arch/frv/kernel/pm-mb93093.c index eaa7b582e..8358e34a3 100644 --- a/arch/frv/kernel/pm-mb93093.c +++ b/arch/frv/kernel/pm-mb93093.c @@ -17,7 +17,7 @@ #include <linux/sysctl.h> #include <linux/errno.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mb86943a.h> diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c index 0b5799274..d7a34a355 100644 --- a/arch/frv/kernel/pm.c +++ b/arch/frv/kernel/pm.c @@ -19,7 +19,7 @@ #include <linux/sysctl.h> #include <linux/errno.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mb86943a.h> diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c index 5d40aeb77..b306241c4 100644 --- a/arch/frv/kernel/process.c +++ b/arch/frv/kernel/process.c @@ -28,7 +28,7 @@ #include <linux/rcupdate.h> #include <asm/asm-offsets.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> #include <asm/pgtable.h> #include <asm/tlb.h> diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c index 3987ff88d..49768401c 100644 --- a/arch/frv/kernel/ptrace.c +++ b/arch/frv/kernel/ptrace.c @@ -23,7 +23,7 @@ #include <linux/elf.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/processor.h> diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index d822700d4..74230760a 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c @@ -22,7 +22,7 @@ #include <linux/personality.h> #include <linux/tracehook.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #define DEBUG_SIG 0 diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c index 9c4980825..f80cc8b9b 100644 --- a/arch/frv/kernel/sys_frv.c +++ b/arch/frv/kernel/sys_frv.c @@ -25,7 +25,7 @@ #include <linux/ipc.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c index 6c155d69d..8a440fac6 100644 --- a/arch/frv/kernel/sysctl.c +++ b/arch/frv/kernel/sysctl.c @@ -12,7 +12,7 @@ #include <linux/sysctl.h> #include <linux/proc_fs.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static const char frv_cache_wback[] = "wback"; static const char frv_cache_wthru[] = "wthru"; diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c index 4bff48c19..619db84f6 100644 --- a/arch/frv/kernel/traps.c +++ b/arch/frv/kernel/traps.c @@ -23,7 +23,7 @@ #include <asm/asm-offsets.h> #include <asm/setup.h> #include <asm/fpu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/siginfo.h> #include <asm/unaligned.h> diff --git a/arch/frv/kernel/uaccess.c b/arch/frv/kernel/uaccess.c index 374f88d6c..8b360b422 100644 --- a/arch/frv/kernel/uaccess.c +++ b/arch/frv/kernel/uaccess.c @@ -11,7 +11,7 @@ #include <linux/mm.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /*****************************************************************************/ /* diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c index 7a73aaeae..e701aa9e6 100644 --- a/arch/frv/mm/dma-alloc.c +++ b/arch/frv/mm/dma-alloc.c @@ -44,7 +44,7 @@ #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/mmu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/smp.h> static int map_page(unsigned long va, unsigned long pa, pgprot_t prot) diff --git a/arch/frv/mm/extable.c b/arch/frv/mm/extable.c index 6aea124f5..b7fd9a210 100644 --- a/arch/frv/mm/extable.c +++ b/arch/frv/mm/extable.c @@ -4,7 +4,7 @@ #include <linux/module.h> #include <linux/spinlock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern const struct exception_table_entry __attribute__((aligned(8))) __start___ex_table[]; extern const struct exception_table_entry __attribute__((aligned(8))) __stop___ex_table[]; diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c index ec4917ddf..bc58c870f 100644 --- a/arch/frv/mm/fault.c +++ b/arch/frv/mm/fault.c @@ -21,7 +21,7 @@ #include <linux/hardirq.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/gdb-stub.h> /*****************************************************************************/ diff --git a/arch/h8300/boot/compressed/misc.c b/arch/h8300/boot/compressed/misc.c index 51ab6cbd0..56e029faf 100644 --- a/arch/h8300/boot/compressed/misc.c +++ b/arch/h8300/boot/compressed/misc.c @@ -9,7 +9,7 @@ * Adapted for h8300 by Yoshinori Sato 2006 */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * gzip declarations diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c index 1a744ab7e..3a7af7a8f 100644 --- a/arch/h8300/kernel/process.c +++ b/arch/h8300/kernel/process.c @@ -38,7 +38,7 @@ #include <linux/slab.h> #include <linux/rcupdate.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/traps.h> #include <asm/setup.h> #include <asm/pgtable.h> diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c index 748cf6585..15ec7a4c5 100644 --- a/arch/h8300/kernel/ptrace.c +++ b/arch/h8300/kernel/ptrace.c @@ -24,7 +24,7 @@ #include <linux/user.h> #include <linux/signal.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/processor.h> diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c index a65ff3b76..65ab88bc7 100644 --- a/arch/h8300/kernel/signal.c +++ b/arch/h8300/kernel/signal.c @@ -41,7 +41,7 @@ #include <linux/tracehook.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/traps.h> #include <asm/ucontext.h> diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c index bf350cb7f..517b20670 100644 --- a/arch/h8300/kernel/sys_h8300.c +++ b/arch/h8300/kernel/sys_h8300.c @@ -21,7 +21,7 @@ #include <linux/ipc.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cachectl.h> #include <asm/traps.h> #include <asm/unistd.h> diff --git a/arch/hexagon/kernel/hexagon_ksyms.c b/arch/hexagon/kernel/hexagon_ksyms.c index 32b1379d6..1ab637d5f 100644 --- a/arch/hexagon/kernel/hexagon_ksyms.c +++ b/arch/hexagon/kernel/hexagon_ksyms.c @@ -19,7 +19,7 @@ */ #include <asm/hexagon_vm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> EXPORT_SYMBOL(__copy_from_user_hexagon); EXPORT_SYMBOL(__copy_to_user_hexagon); diff --git a/arch/hexagon/kernel/signal.c b/arch/hexagon/kernel/signal.c index d7c73874b..40a0ca3c4 100644 --- a/arch/hexagon/kernel/signal.c +++ b/arch/hexagon/kernel/signal.c @@ -24,7 +24,7 @@ #include <asm/registers.h> #include <asm/thread_info.h> #include <asm/unistd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ucontext.h> #include <asm/cacheflush.h> #include <asm/signal.h> diff --git a/arch/hexagon/mm/uaccess.c b/arch/hexagon/mm/uaccess.c index 34127261c..ec90afdb3 100644 --- a/arch/hexagon/mm/uaccess.c +++ b/arch/hexagon/mm/uaccess.c @@ -23,7 +23,7 @@ * we implement here as subroutines. */ #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> /* diff --git a/arch/hexagon/mm/vm_fault.c b/arch/hexagon/mm/vm_fault.c index 8704c9320..1731c16c4 100644 --- a/arch/hexagon/mm/vm_fault.c +++ b/arch/hexagon/mm/vm_fault.c @@ -26,7 +26,7 @@ #include <asm/pgtable.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mm.h> #include <linux/signal.h> #include <linux/module.h> diff --git a/arch/ia64/kernel/brl_emu.c b/arch/ia64/kernel/brl_emu.c index 0b286ca16..8682df626 100644 --- a/arch/ia64/kernel/brl_emu.c +++ b/arch/ia64/kernel/brl_emu.c @@ -9,7 +9,7 @@ #include <linux/kernel.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> extern char ia64_set_b1, ia64_set_b2, ia64_set_b3, ia64_set_b4, ia64_set_b5; diff --git a/arch/ia64/kernel/crash_dump.c b/arch/ia64/kernel/crash_dump.c index c8c929866..9c12b794e 100644 --- a/arch/ia64/kernel/crash_dump.c +++ b/arch/ia64/kernel/crash_dump.c @@ -11,7 +11,7 @@ #include <linux/crash_dump.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /** * copy_oldmem_page - copy one page from "oldmem" diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c index 5b7791dd3..3bff945fa 100644 --- a/arch/ia64/kernel/ia64_ksyms.c +++ b/arch/ia64/kernel/ia64_ksyms.c @@ -35,7 +35,7 @@ EXPORT_SYMBOL(ia64_cpu_info); EXPORT_SYMBOL(local_per_cpu_offset); #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> EXPORT_SYMBOL(__copy_user); EXPORT_SYMBOL(__do_clear_user); EXPORT_SYMBOL(__strlen_user); diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c index f9efe9739..08d620908 100644 --- a/arch/ia64/kernel/init_task.c +++ b/arch/ia64/kernel/init_task.c @@ -14,7 +14,7 @@ #include <linux/init_task.h> #include <linux/mqueue.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> static struct signal_struct init_signals = INIT_SIGNALS(init_signals); diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index f2c418281..c80fd7de0 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c @@ -17,7 +17,7 @@ */ #include <asm/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/seq_file.h> #include <linux/interrupt.h> diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index f8280a766..f97436920 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c @@ -33,7 +33,7 @@ #include <asm/pgtable.h> #include <asm/sections.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern void jprobe_inst_return(void); diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 9ea25fce0..5af976945 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -50,7 +50,7 @@ #include <asm/perfmon.h> #include <asm/processor.h> #include <asm/signal.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/delay.h> #ifdef CONFIG_PERFMON diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 55d4ba47a..d7f8563e9 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -41,7 +41,7 @@ #include <asm/sal.h> #include <asm/switch_to.h> #include <asm/tlbflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unwind.h> #include <asm/user.h> diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index b7a5fffe0..657bc1b12 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c @@ -26,7 +26,7 @@ #include <asm/processor.h> #include <asm/ptrace_offsets.h> #include <asm/rse.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unwind.h> #ifdef CONFIG_PERFMON #include <asm/perfmon.h> diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index 960a396f5..e4d9bbaf8 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c @@ -48,7 +48,7 @@ #include <linux/semaphore.h> #include <asm/sal.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> MODULE_AUTHOR("Jesse Barnes <jbarnes@sgi.com>"); MODULE_DESCRIPTION("/proc interface to IA-64 SAL features"); diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c index 3637e03d2..fd658d859 100644 --- a/arch/ia64/kernel/signal.c +++ b/arch/ia64/kernel/signal.c @@ -22,7 +22,7 @@ #include <linux/wait.h> #include <asm/intrinsics.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/rse.h> #include <asm/sigcontext.h> diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c index 41e33f84c..a09c12230 100644 --- a/arch/ia64/kernel/sys_ia64.c +++ b/arch/ia64/kernel/sys_ia64.c @@ -18,7 +18,7 @@ #include <linux/hugetlb.h> #include <asm/shmparam.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> unsigned long arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len, diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index f7f9f9c6c..d3f678f06 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c @@ -21,7 +21,7 @@ #include <asm/fpswa.h> #include <asm/intrinsics.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> fpswa_interface_t *fpswa_interface; diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c index 622772b7f..ca71dab74 100644 --- a/arch/ia64/kernel/unaligned.c +++ b/arch/ia64/kernel/unaligned.c @@ -22,7 +22,7 @@ #include <asm/intrinsics.h> #include <asm/processor.h> #include <asm/rse.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> extern int die_if_kernel(char *str, struct pt_regs *regs, long err); diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c index 8f6619599..9704e2cd9 100644 --- a/arch/ia64/kernel/unwind.c +++ b/arch/ia64/kernel/unwind.c @@ -41,7 +41,7 @@ #include <asm/ptrace_offsets.h> #include <asm/rse.h> #include <asm/sections.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "entry.h" #include "unwind_i.h" diff --git a/arch/ia64/lib/csum_partial_copy.c b/arch/ia64/lib/csum_partial_copy.c index 118daf5a0..42f7678ef 100644 --- a/arch/ia64/lib/csum_partial_copy.c +++ b/arch/ia64/lib/csum_partial_copy.c @@ -11,7 +11,7 @@ #include <linux/types.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * XXX Fixme: those 2 inlines are meant for debugging and will go away diff --git a/arch/ia64/mm/extable.c b/arch/ia64/mm/extable.c index c99a41e29..24526db8d 100644 --- a/arch/ia64/mm/extable.c +++ b/arch/ia64/mm/extable.c @@ -7,7 +7,7 @@ #include <linux/sort.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> static int cmp_ex(const void *a, const void *b) diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index ba5ba7acc..139d49232 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c @@ -14,7 +14,7 @@ #include <asm/pgtable.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern int die(char *, struct pt_regs *, long); diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index d1fe4b402..bfdf52b80 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -31,7 +31,7 @@ #include <asm/sal.h> #include <asm/sections.h> #include <asm/tlb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/mca.h> #include <asm/paravirt.h> diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index b9992571c..4c3b84d84 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c @@ -37,7 +37,7 @@ #include <asm/processor.h> #include <asm/topology.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sal.h> #include <asm/sn/io.h> #include <asm/sn/sn_sal.h> diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c index 7aab87f48..29cf8f8c0 100644 --- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c +++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c @@ -9,7 +9,7 @@ #ifdef CONFIG_PROC_FS #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sn/sn_sal.h> static int partition_id_show(struct seq_file *s, void *p) diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index e35f6485c..32d0380eb 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c @@ -14,7 +14,7 @@ #include <linux/capability.h> #include <linux/device.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sn/sn_sal.h> #include <asm/sn/addrs.h> #include <asm/sn/io.h> diff --git a/arch/m32r/kernel/align.c b/arch/m32r/kernel/align.c index ab871ccd3..ec51e5b34 100644 --- a/arch/m32r/kernel/align.c +++ b/arch/m32r/kernel/align.c @@ -5,7 +5,7 @@ */ #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int get_reg(struct pt_regs *regs, int nr) { diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c index c7272b894..5537f7397 100644 --- a/arch/m32r/kernel/irq.c +++ b/arch/m32r/kernel/irq.c @@ -19,7 +19,7 @@ #include <linux/kernel_stat.h> #include <linux/interrupt.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * do_IRQ handles all normal device IRQs (the special diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c index b727e693c..35723b4d1 100644 --- a/arch/m32r/kernel/m32r_ksyms.c +++ b/arch/m32r/kernel/m32r_ksyms.c @@ -8,7 +8,7 @@ #include <linux/string.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> #include <asm/delay.h> diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index e69221d58..1bedb4ebe 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c @@ -29,7 +29,7 @@ #include <linux/rcupdate.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/elf.h> #include <asm/m32r.h> diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c index 51f5e9aa4..df13ba1b0 100644 --- a/arch/m32r/kernel/ptrace.c +++ b/arch/m32r/kernel/ptrace.c @@ -27,7 +27,7 @@ #include <asm/cacheflush.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/mmu_context.h> diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index d503568cb..203b6fdf3 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c @@ -23,7 +23,7 @@ #include <linux/tracehook.h> #include <asm/cacheflush.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DEBUG_SIG 0 diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c index c3fdd632f..f34957032 100644 --- a/arch/m32r/kernel/sys_m32r.c +++ b/arch/m32r/kernel/sys_m32r.c @@ -22,7 +22,7 @@ #include <linux/utsname.h> #include <linux/ipc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cachectl.h> #include <asm/cacheflush.h> #include <asm/syscall.h> diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c index a7a424f85..c3c5fdfae 100644 --- a/arch/m32r/kernel/traps.c +++ b/arch/m32r/kernel/traps.c @@ -18,7 +18,7 @@ #include <asm/page.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/atomic.h> diff --git a/arch/m32r/lib/csum_partial_copy.c b/arch/m32r/lib/csum_partial_copy.c index 5596f3df8..b3cd59c12 100644 --- a/arch/m32r/lib/csum_partial_copy.c +++ b/arch/m32r/lib/csum_partial_copy.c @@ -22,7 +22,7 @@ #include <net/checksum.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Copy while checksumming, otherwise like csum_partial diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c index 82abd159d..fd03f2731 100644 --- a/arch/m32r/lib/usercopy.c +++ b/arch/m32r/lib/usercopy.c @@ -9,7 +9,7 @@ #include <linux/prefetch.h> #include <linux/string.h> #include <linux/thread_info.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) diff --git a/arch/m32r/mm/extable.c b/arch/m32r/mm/extable.c index 1743f23d4..40ccf80d2 100644 --- a/arch/m32r/mm/extable.c +++ b/arch/m32r/mm/extable.c @@ -3,7 +3,7 @@ */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) { diff --git a/arch/m32r/mm/fault-nommu.c b/arch/m32r/mm/fault-nommu.c index 80f18cc6f..e22d5ddae 100644 --- a/arch/m32r/mm/fault-nommu.c +++ b/arch/m32r/mm/fault-nommu.c @@ -22,7 +22,7 @@ #include <linux/vt_kern.h> /* For unblank_screen() */ #include <asm/m32r.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> #include <asm/hardirq.h> diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index e3d4d4890..cd7e62fcf 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c @@ -26,7 +26,7 @@ #include <linux/module.h> #include <asm/m32r.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h> diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c index cf12a17dc..504bfd3bb 100644 --- a/arch/m68k/bvme6000/rtc.c +++ b/arch/m68k/bvme6000/rtc.c @@ -20,7 +20,7 @@ #include <asm/bvme6000hw.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> /* diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index c55ff719f..10a940638 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -27,7 +27,7 @@ #include <linux/mqueue.h> #include <linux/rcupdate.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/traps.h> #include <asm/machdep.h> #include <asm/setup.h> diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index 1bc10e62b..9cd86d734 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c @@ -20,7 +20,7 @@ #include <linux/signal.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/processor.h> diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index 2a16df3d9..2b46432de 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -46,7 +46,7 @@ #include <linux/tracehook.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/traps.h> #include <asm/ucontext.h> diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c index 3a480b3df..cf63b6678 100644 --- a/arch/m68k/kernel/sys_m68k.c +++ b/arch/m68k/kernel/sys_m68k.c @@ -22,7 +22,7 @@ #include <linux/ipc.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cachectl.h> #include <asm/traps.h> #include <asm/page.h> diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index 88fcd8c70..deeb65504 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c @@ -32,7 +32,7 @@ #include <asm/setup.h> #include <asm/fpu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/traps.h> #include <asm/pgalloc.h> #include <asm/machdep.h> diff --git a/arch/m68k/lib/uaccess.c b/arch/m68k/lib/uaccess.c index 35d1442de..a76b73aba 100644 --- a/arch/m68k/lib/uaccess.c +++ b/arch/m68k/lib/uaccess.c @@ -5,7 +5,7 @@ */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> unsigned long __generic_copy_from_user(void *to, const void __user *from, unsigned long n) diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 5e085554a..1612fdc7e 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -16,7 +16,7 @@ #include <linux/cuda.h> #include <linux/pmu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/rtc.h> #include <asm/segment.h> diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index f0eef0491..ae5d22f54 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -13,7 +13,7 @@ #include <asm/setup.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> extern void die_if_kernel(char *, struct pt_regs *, long); diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index 1af2ca341..de3669c02 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -20,7 +20,7 @@ #include <linux/gfp.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgalloc.h> #include <asm/traps.h> diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 251c54377..04645a331 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -21,7 +21,7 @@ #include <linux/gfp.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgalloc.h> #include <asm/machdep.h> diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c index 269f81158..b5b7d53f7 100644 --- a/arch/m68k/mm/sun3mmu.c +++ b/arch/m68k/mm/sun3mmu.c @@ -18,7 +18,7 @@ #include <linux/bootmem.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/machdep.h> diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c index 6ef7a81a3..5d5599742 100644 --- a/arch/m68k/mvme16x/rtc.c +++ b/arch/m68k/mvme16x/rtc.c @@ -19,7 +19,7 @@ #include <asm/mvme16xhw.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> /* diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c index 8edc510a2..5686dc164 100644 --- a/arch/m68k/sun3/mmu_emu.c +++ b/arch/m68k/sun3/mmu_emu.c @@ -17,7 +17,7 @@ #include <asm/setup.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/sun3mmu.h> diff --git a/arch/metag/kernel/irq.c b/arch/metag/kernel/irq.c index 87707efeb..abfcf1376 100644 --- a/arch/metag/kernel/irq.c +++ b/arch/metag/kernel/irq.c @@ -13,7 +13,7 @@ #include <asm/core_reg.h> #include <asm/mach/arch.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_4KSTACKS union irq_ctx { diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c index 0c7fce2a3..8e211aa5a 100644 --- a/arch/mips/alchemy/common/power.c +++ b/arch/mips/alchemy/common/power.c @@ -34,7 +34,7 @@ #include <linux/sysctl.h> #include <linux/jiffies.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mach-au1x00/au1000.h> /* diff --git a/arch/mips/dec/kn01-berr.c b/arch/mips/dec/kn01-berr.c index 44d8a87a8..e9d2db480 100644 --- a/arch/mips/dec/kn01-berr.c +++ b/arch/mips/dec/kn01-berr.c @@ -23,7 +23,7 @@ #include <asm/page.h> #include <asm/ptrace.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/dec/kn01.h> diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h index d48cf4400..5f8310d99 100644 --- a/arch/mips/include/asm/checksum.h +++ b/arch/mips/include/asm/checksum.h @@ -13,7 +13,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/mips/include/asm/compat-signal.h b/arch/mips/include/asm/compat-signal.h index 64e0b9343..4c6176467 100644 --- a/arch/mips/include/asm/compat-signal.h +++ b/arch/mips/include/asm/compat-signal.h @@ -8,7 +8,7 @@ #include <asm/signal.h> #include <asm/siginfo.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static inline int __copy_conv_sigset_to_user(compat_sigset_t __user *d, const sigset_t *s) diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h index 44b705d08..16f7c9ef9 100644 --- a/arch/mips/include/asm/module.h +++ b/arch/mips/include/asm/module.h @@ -3,7 +3,7 @@ #include <linux/list.h> #include <linux/elf.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct mod_arch_specific { /* Data Bus Error exception tables */ diff --git a/arch/mips/include/asm/termios.h b/arch/mips/include/asm/termios.h index 6245b68a6..ce2d72e34 100644 --- a/arch/mips/include/asm/termios.h +++ b/arch/mips/include/asm/termios.h @@ -9,7 +9,7 @@ #ifndef _ASM_TERMIOS_H #define _ASM_TERMIOS_H -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <uapi/asm/termios.h> /* diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index db6f5afff..1900f3958 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c @@ -18,7 +18,7 @@ #include <asm/mipsregs.h> #include <asm/jazz.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/dma.h> #include <asm/jazzdma.h> #include <asm/pgtable.h> diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 63b942f61..4a2755630 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -17,7 +17,7 @@ #include <asm/fpu_emulator.h> #include <asm/inst.h> #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Calculate and return exception PC in case of branch delay slot diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index d866a45b5..d0efa1f26 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -25,7 +25,7 @@ #include <asm/watch.h> #include <asm/elf.h> #include <asm/spram.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int mips_fpu_disabled; diff --git a/arch/mips/kernel/crash_dump.c b/arch/mips/kernel/crash_dump.c index 3be9e7bb3..822056fff 100644 --- a/arch/mips/kernel/crash_dump.c +++ b/arch/mips/kernel/crash_dump.c @@ -1,7 +1,7 @@ #include <linux/highmem.h> #include <linux/bootmem.h> #include <linux/crash_dump.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> static int __init parse_savemaxmem(char *p) diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 7479d8d84..8f3864c63 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -23,7 +23,7 @@ #include <linux/ftrace.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_KGDB int kgdb_early_setup; diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 0b29646bc..fc5b6745b 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -39,7 +39,7 @@ #include <asm/compat-signal.h> #include <asm/sim.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/mman.h> diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c index 0f3e030f2..e3806f2e7 100644 --- a/arch/mips/kernel/mips-mt-fpaff.c +++ b/arch/mips/kernel/mips-mt-fpaff.c @@ -11,7 +11,7 @@ #include <linux/sched.h> #include <linux/security.h> #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * CPU mask used to set process affinity for MT VPEs/TCs with FPUs diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index cedeb5686..fb02697fa 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c @@ -12,7 +12,7 @@ #include <linux/export.h> #include <asm/checksum.h> #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ftrace.h> #include <asm/fpu.h> diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 3cfa3bc28..bde2aa353 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -35,7 +35,7 @@ #include <asm/pgtable.h> #include <asm/mipsregs.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/elf.h> #include <asm/isadep.h> diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index 1b95b2443..131f79cda 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -34,7 +34,7 @@ #include <asm/mipsmtregs.h> #include <asm/pgtable.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/bootinfo.h> #include <asm/reg.h> diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c index 9486055ba..75ea8aae4 100644 --- a/arch/mips/kernel/ptrace32.c +++ b/arch/mips/kernel/ptrace32.c @@ -32,7 +32,7 @@ #include <asm/mipsmtregs.h> #include <asm/pgtable.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/bootinfo.h> /* diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c index 6fa198db8..4d9d64baf 100644 --- a/arch/mips/kernel/rtlx.c +++ b/arch/mips/kernel/rtlx.c @@ -21,7 +21,7 @@ #include <linux/kernel.h> #include <linux/fs.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/list.h> #include <linux/vmalloc.h> #include <linux/elf.h> diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c index b2241bb9c..400898124 100644 --- a/arch/mips/kernel/signal_n32.c +++ b/arch/mips/kernel/signal_n32.c @@ -33,7 +33,7 @@ #include <asm/cacheflush.h> #include <asm/compat-signal.h> #include <asm/sim.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ucontext.h> #include <asm/fpu.h> #include <asm/cpu-features.h> diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index eb0f4dfb3..ffd37c2f0 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c @@ -36,7 +36,7 @@ #include <asm/sim.h> #include <asm/shmparam.h> #include <asm/sysmips.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/switch_to.h> /* diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 5bfb67557..8a50c15c7 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -50,7 +50,7 @@ #include <asm/sections.h> #include <asm/tlbdebug.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/watch.h> #include <asm/mmu_context.h> #include <asm/types.h> diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index 2c81265bc..c7dbaafee 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c @@ -86,7 +86,7 @@ #include <asm/fpu.h> #include <asm/fpu_emulator.h> #include <asm/inst.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/fpu.h> #include <asm/fpu_emulator.h> diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 1765bab00..39f618a12 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c @@ -31,7 +31,7 @@ #include <linux/device.h> #include <linux/fs.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/list.h> #include <linux/vmalloc.h> diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c index dbddc9ccf..bcb5b235e 100644 --- a/arch/mips/math-emu/cp1emu.c +++ b/arch/mips/math-emu/cp1emu.c @@ -46,7 +46,7 @@ #include <asm/mipsregs.h> #include <asm/fpu_emulator.h> #include <asm/fpu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/branch.h> #include "ieee754.h" diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c index 7ea622ab8..95a459abc 100644 --- a/arch/mips/math-emu/dsemul.c +++ b/arch/mips/math-emu/dsemul.c @@ -9,7 +9,7 @@ #include <asm/cpu.h> #include <asm/inst.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/branch.h> #include <asm/mipsregs.h> #include <asm/cacheflush.h> diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c index 1c586575f..b9a9e10e6 100644 --- a/arch/mips/math-emu/kernel_linkage.c +++ b/arch/mips/math-emu/kernel_linkage.c @@ -22,7 +22,7 @@ #include <linux/sched.h> #include <asm/processor.h> #include <asm/signal.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/fpu.h> #include <asm/fpu_emulator.h> diff --git a/arch/mips/mm/extable.c b/arch/mips/mm/extable.c index 9d25d2ba4..5fc59e502 100644 --- a/arch/mips/mm/extable.c +++ b/arch/mips/mm/extable.c @@ -8,7 +8,7 @@ #include <linux/module.h> #include <linux/spinlock.h> #include <asm/branch.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) { diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index c40a8d1c4..73f1cfe81 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c @@ -22,7 +22,7 @@ #include <asm/branch.h> #include <asm/mmu_context.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ #include <linux/kdebug.h> diff --git a/arch/mips/sgi-ip22/ip28-berr.c b/arch/mips/sgi-ip22/ip28-berr.c index 3f4734660..d315b3892 100644 --- a/arch/mips/sgi-ip22/ip28-berr.c +++ b/arch/mips/sgi-ip22/ip28-berr.c @@ -19,7 +19,7 @@ #include <asm/sgi/ioc.h> #include <asm/sgi/ip22.h> #include <asm/r4kcache.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/bootinfo.h> static unsigned int count_be_is_fixup; diff --git a/arch/mips/sgi-ip27/ip27-berr.c b/arch/mips/sgi-ip27/ip27-berr.c index 692778da9..2e0edb385 100644 --- a/arch/mips/sgi-ip27/ip27-berr.c +++ b/arch/mips/sgi-ip27/ip27-berr.c @@ -19,7 +19,7 @@ #include <asm/sn/sn0/hub.h> #include <asm/tlbdebug.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static void dump_hub_information(unsigned long errst0, unsigned long errst1) { diff --git a/arch/mips/sgi-ip32/ip32-berr.c b/arch/mips/sgi-ip32/ip32-berr.c index afc1cadbb..ba8f46d80 100644 --- a/arch/mips/sgi-ip32/ip32-berr.c +++ b/arch/mips/sgi-ip32/ip32-berr.c @@ -11,7 +11,7 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/addrspace.h> #include <asm/ptrace.h> #include <asm/tlbdebug.h> diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c index 2188b39a1..c21a5087b 100644 --- a/arch/mips/sibyte/common/sb_tbprof.c +++ b/arch/mips/sibyte/common/sb_tbprof.c @@ -53,7 +53,7 @@ #define K_INT_PERF_CNT K_BCM1480_INT_PERF_CNT #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define SBPROF_TB_MAJOR 240 diff --git a/arch/mn10300/include/asm/processor.h b/arch/mn10300/include/asm/processor.h index 8b80b19d0..2459af3b0 100644 --- a/arch/mn10300/include/asm/processor.h +++ b/arch/mn10300/include/asm/processor.h @@ -18,7 +18,7 @@ #include <asm/page.h> #include <asm/ptrace.h> #include <asm/cpu-regs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/current.h> /* Forward declaration, a strange C thing */ diff --git a/arch/mn10300/kernel/fpu.c b/arch/mn10300/kernel/fpu.c index 064fa194d..2578b7ae7 100644 --- a/arch/mn10300/kernel/fpu.c +++ b/arch/mn10300/kernel/fpu.c @@ -8,7 +8,7 @@ * as published by the Free Software Foundation; either version * 2 of the Licence, or (at your option) any later version. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/fpu.h> #include <asm/elf.h> #include <asm/exceptions.h> diff --git a/arch/mn10300/kernel/mn10300_ksyms.c b/arch/mn10300/kernel/mn10300_ksyms.c index f9eb9753a..ec6c4f8f9 100644 --- a/arch/mn10300/kernel/mn10300_ksyms.c +++ b/arch/mn10300/kernel/mn10300_ksyms.c @@ -9,7 +9,7 @@ * 2 of the Licence, or (at your option) any later version. */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c index 3707da583..c5613c965 100644 --- a/arch/mn10300/kernel/process.c +++ b/arch/mn10300/kernel/process.c @@ -26,7 +26,7 @@ #include <linux/fs.h> #include <linux/slab.h> #include <linux/rcupdate.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> #include <asm/processor.h> diff --git a/arch/mn10300/kernel/ptrace.c b/arch/mn10300/kernel/ptrace.c index 5bd58514e..976020f46 100644 --- a/arch/mn10300/kernel/ptrace.c +++ b/arch/mn10300/kernel/ptrace.c @@ -19,7 +19,7 @@ #include <linux/regset.h> #include <linux/elf.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/cacheflush.h> diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index ebac9c11f..3643e88f2 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c @@ -25,7 +25,7 @@ #include <linux/cpu.h> #include <asm/processor.h> #include <linux/console.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> #include <asm/io.h> #include <asm/smp.h> diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c index 9dfac5cd1..f26bcd38f 100644 --- a/arch/mn10300/kernel/signal.c +++ b/arch/mn10300/kernel/signal.c @@ -25,7 +25,7 @@ #include <linux/tracehook.h> #include <asm/cacheflush.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/fpu.h> #include "sigframe.h" diff --git a/arch/mn10300/kernel/sys_mn10300.c b/arch/mn10300/kernel/sys_mn10300.c index 815f1355f..f999981e5 100644 --- a/arch/mn10300/kernel/sys_mn10300.c +++ b/arch/mn10300/kernel/sys_mn10300.c @@ -21,7 +21,7 @@ #include <linux/file.h> #include <linux/tty.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> asmlinkage long old_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, diff --git a/arch/mn10300/lib/checksum.c b/arch/mn10300/lib/checksum.c index b6580f5d8..0f569151e 100644 --- a/arch/mn10300/lib/checksum.c +++ b/arch/mn10300/lib/checksum.c @@ -12,7 +12,7 @@ #include <linux/module.h> #include <linux/errno.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/checksum.h> #include "internal.h" diff --git a/arch/mn10300/mm/cache-smp.c b/arch/mn10300/mm/cache-smp.c index 2d23b9eee..e80996064 100644 --- a/arch/mn10300/mm/cache-smp.c +++ b/arch/mn10300/mm/cache-smp.c @@ -18,7 +18,7 @@ #include <asm/processor.h> #include <asm/cacheflush.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/smp.h> #include "cache-smp.h" diff --git a/arch/mn10300/mm/cache.c b/arch/mn10300/mm/cache.c index 0a1f0aa92..0b925cce2 100644 --- a/arch/mn10300/mm/cache.c +++ b/arch/mn10300/mm/cache.c @@ -17,7 +17,7 @@ #include <asm/processor.h> #include <asm/cacheflush.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/smp.h> #include "cache-smp.h" diff --git a/arch/mn10300/mm/extable.c b/arch/mn10300/mm/extable.c index 25e5485ab..305de461c 100644 --- a/arch/mn10300/mm/extable.c +++ b/arch/mn10300/mm/extable.c @@ -10,7 +10,7 @@ */ #include <linux/module.h> #include <linux/spinlock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) { diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c index 0c2cc5d39..7e90f5c25 100644 --- a/arch/mn10300/mm/fault.c +++ b/arch/mn10300/mm/fault.c @@ -24,7 +24,7 @@ #include <linux/init.h> #include <linux/vt_kern.h> /* For unblank_screen() */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/hardirq.h> #include <asm/cpu-regs.h> diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c index 5a8ace63a..9314d57a5 100644 --- a/arch/mn10300/mm/init.c +++ b/arch/mn10300/mm/init.c @@ -29,7 +29,7 @@ #include <linux/gfp.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> #include <asm/dma.h> diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c index b9920b1ed..31d04da85 100644 --- a/arch/mn10300/mm/misalignment.c +++ b/arch/mn10300/mm/misalignment.c @@ -23,7 +23,7 @@ #include <linux/interrupt.h> #include <linux/pci.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/atomic.h> #include <asm/smp.h> diff --git a/arch/mn10300/proc-mn2ws0050/proc-init.c b/arch/mn10300/proc-mn2ws0050/proc-init.c index ee6d03dbc..947f0e31c 100644 --- a/arch/mn10300/proc-mn2ws0050/proc-init.c +++ b/arch/mn10300/proc-mn2ws0050/proc-init.c @@ -15,7 +15,7 @@ #include <linux/interrupt.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/atomic.h> #include <asm/smp.h> diff --git a/arch/openrisc/kernel/or32_ksyms.c b/arch/openrisc/kernel/or32_ksyms.c index 83ccf7c0c..86e31cf1d 100644 --- a/arch/openrisc/kernel/or32_ksyms.c +++ b/arch/openrisc/kernel/or32_ksyms.c @@ -24,7 +24,7 @@ #include <linux/semaphore.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> #include <asm/hardirq.h> diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c index 386af2585..5e87f8e8c 100644 --- a/arch/openrisc/kernel/process.c +++ b/arch/openrisc/kernel/process.c @@ -36,7 +36,7 @@ #include <linux/mqueue.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> #include <asm/processor.h> diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c index c277ec827..da448da45 100644 --- a/arch/openrisc/kernel/signal.c +++ b/arch/openrisc/kernel/signal.c @@ -30,7 +30,7 @@ #include <asm/processor.h> #include <asm/syscall.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DEBUG_SIG 0 diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c index 3d3f6062f..a4574cb4b 100644 --- a/arch/openrisc/kernel/traps.c +++ b/arch/openrisc/kernel/traps.c @@ -31,7 +31,7 @@ #include <linux/timer.h> #include <linux/mm.h> #include <linux/kallsyms.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/segment.h> #include <asm/io.h> diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index 230ac20ae..e67a4b5f7 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -20,7 +20,7 @@ #include <linux/module.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/siginfo.h> #include <asm/signal.h> diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c index 88d0962de..ee304e7b3 100644 --- a/arch/parisc/hpux/fs.c +++ b/arch/parisc/hpux/fs.c @@ -29,7 +29,7 @@ #include <linux/ptrace.h> #include <linux/slab.h> #include <asm/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int hpux_execve(struct pt_regs *regs) { diff --git a/arch/parisc/hpux/ioctl.c b/arch/parisc/hpux/ioctl.c index dede47658..f860c8f42 100644 --- a/arch/parisc/hpux/ioctl.c +++ b/arch/parisc/hpux/ioctl.c @@ -38,7 +38,7 @@ #include <asm/errno.h> #include <asm/ioctl.h> #include <asm/termios.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int hpux_ioctl_t(int fd, unsigned long cmd, unsigned long arg) { diff --git a/arch/parisc/hpux/sys_hpux.c b/arch/parisc/hpux/sys_hpux.c index d9dc6cd3b..d439e6128 100644 --- a/arch/parisc/hpux/sys_hpux.c +++ b/arch/parisc/hpux/sys_hpux.c @@ -35,7 +35,7 @@ #include <asm/errno.h> #include <asm/pgalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> unsigned long hpux_brk(unsigned long addr) { diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c index dcd55103a..939802518 100644 --- a/arch/parisc/kernel/asm-offsets.c +++ b/arch/parisc/kernel/asm-offsets.c @@ -38,7 +38,7 @@ #include <asm/ptrace.h> #include <asm/processor.h> #include <asm/pdc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_64BIT #define FRAME_SIZE 128 diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 3cad8aadc..7484b3d11 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c @@ -43,7 +43,7 @@ EXPORT_SYMBOL(__xchg64); EXPORT_SYMBOL(__cmpxchg_u64); #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> EXPORT_SYMBOL(lclear_user); EXPORT_SYMBOL(lstrnlen_user); diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index d87d1c476..67cdf2b16 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c @@ -33,7 +33,7 @@ #include <asm/io.h> #include <asm/page.h> /* get_order */ #include <asm/pgalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlbflush.h> /* for purge_tlb_*() macros */ static struct proc_dir_entry * proc_gsc_root __read_mostly = NULL; diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c index ba0c053e2..d9205464e 100644 --- a/arch/parisc/kernel/perf.c +++ b/arch/parisc/kernel/perf.c @@ -48,7 +48,7 @@ #include <linux/miscdevice.h> #include <linux/spinlock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/perf.h> #include <asm/parisc-device.h> #include <asm/processor.h> diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c index 534abd493..c9f7b428e 100644 --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c @@ -20,7 +20,7 @@ #include <linux/compat.h> #include <linux/signal.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/asm-offsets.h> diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index ae9aa8385..47894e826 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c @@ -28,7 +28,7 @@ #include <linux/elf.h> #include <asm/ucontext.h> #include <asm/rt_sigframe.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/cacheflush.h> #include <asm/asm-offsets.h> diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c index 33eca1b04..8f671af1c 100644 --- a/arch/parisc/kernel/signal32.c +++ b/arch/parisc/kernel/signal32.c @@ -31,7 +31,7 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "signal32.h" #include "sys32.h" diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c index 0d3a9d492..ab9d989c9 100644 --- a/arch/parisc/kernel/sys_parisc.c +++ b/arch/parisc/kernel/sys_parisc.c @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/file.h> #include <linux/fs.h> #include <linux/linkage.h> diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c index a134ff4da..5e774b5cd 100644 --- a/arch/parisc/kernel/sys_parisc32.c +++ b/arch/parisc/kernel/sys_parisc32.c @@ -39,7 +39,7 @@ #include <linux/syscalls.h> #include <asm/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include "sys32.h" diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index 70e105d62..5d11cf845 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c @@ -26,7 +26,7 @@ #include <linux/platform_device.h> #include <linux/ftrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/page.h> diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 0c329b2c5..6c4de930f 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c @@ -27,7 +27,7 @@ #include <linux/bug.h> #include <asm/assembly.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/traps.h> diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index 8d49614d6..a22664df5 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c @@ -26,7 +26,7 @@ #include <linux/sched.h> #include <linux/signal.h> #include <linux/ratelimit.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/hardirq.h> /* #define DEBUG_UNALIGNED 1 */ diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c index 76ed62ed7..5865e761e 100644 --- a/arch/parisc/kernel/unwind.c +++ b/arch/parisc/kernel/unwind.c @@ -15,7 +15,7 @@ #include <linux/kallsyms.h> #include <linux/sort.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/assembly.h> #include <asm/asm-offsets.h> #include <asm/ptrace.h> diff --git a/arch/parisc/lib/checksum.c b/arch/parisc/lib/checksum.c index ae66d31f9..ba6384da6 100644 --- a/arch/parisc/lib/checksum.c +++ b/arch/parisc/lib/checksum.c @@ -20,7 +20,7 @@ #include <net/checksum.h> #include <asm/byteorder.h> #include <asm/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define addc(_t,_r) \ __asm__ __volatile__ ( \ diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c index ac4370b1c..7e14ca462 100644 --- a/arch/parisc/lib/memcpy.c +++ b/arch/parisc/lib/memcpy.c @@ -56,7 +56,7 @@ #ifdef __KERNEL__ #include <linux/module.h> #include <linux/compiler.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define s_space "%%sr1" #define d_space "%%sr2" #else diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index c45130f56..8174ff8ab 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -16,7 +16,7 @@ #include <linux/interrupt.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/traps.h> #define PRINT_USER_FAULTS /* (turn this on if you want user faults to be */ diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c index b3bab9575..b0393c92e 100644 --- a/arch/powerpc/kernel/align.c +++ b/arch/powerpc/kernel/align.c @@ -20,7 +20,7 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cache.h> #include <asm/cputable.h> #include <asm/emulated_ops.h> diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c index 555ae67e4..a52c7ba77 100644 --- a/arch/powerpc/kernel/crash_dump.c +++ b/arch/powerpc/kernel/crash_dump.c @@ -18,7 +18,7 @@ #include <asm/kdump.h> #include <asm/prom.h> #include <asm/firmware.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/rtas.h> #ifdef DEBUG diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c index 7531f9abf..5f6407902 100644 --- a/arch/powerpc/kernel/hw_breakpoint.c +++ b/arch/powerpc/kernel/hw_breakpoint.c @@ -34,7 +34,7 @@ #include <asm/hw_breakpoint.h> #include <asm/processor.h> #include <asm/sstep.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Stores the breakpoints currently in use on each breakpoint address diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index ea185e0b3..abcd8aea7 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -56,7 +56,7 @@ #include <linux/of.h> #include <linux/of_irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/pgtable.h> #include <asm/irq.h> diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c index 762c10d46..4547a5d30 100644 --- a/arch/powerpc/kernel/kprobes.c +++ b/arch/powerpc/kernel/kprobes.c @@ -34,7 +34,7 @@ #include <linux/slab.h> #include <asm/cacheflush.h> #include <asm/sstep.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_PPC_ADV_DEBUG_REGS #define MSR_SINGLESTEP (MSR_DE) diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c index e2a0a1622..3a205b221 100644 --- a/arch/powerpc/kernel/lparcfg.c +++ b/arch/powerpc/kernel/lparcfg.c @@ -25,7 +25,7 @@ #include <linux/init.h> #include <linux/seq_file.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/lppaca.h> #include <asm/hvcall.h> #include <asm/firmware.h> diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c index 2d275707f..523af07f1 100644 --- a/arch/powerpc/kernel/module.c +++ b/arch/powerpc/kernel/module.c @@ -22,7 +22,7 @@ #include <linux/vmalloc.h> #include <linux/bug.h> #include <asm/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/firmware.h> #include <linux/sort.h> diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index 4047d8a03..b004576ff 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -26,7 +26,7 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/nvram.h> #include <asm/rtas.h> #include <asm/prom.h> diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 432459c81..0d1573b85 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c @@ -24,7 +24,7 @@ #include <asm/pci-bridge.h> #include <asm/ppc-pci.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/machdep.h> #undef DEBUG diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index c29666586..b7bd6c0ce 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c @@ -16,7 +16,7 @@ #include <asm/page.h> #include <asm/processor.h> #include <asm/cacheflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/atomic.h> #include <asm/checksum.h> diff --git a/arch/powerpc/kernel/proc_powerpc.c b/arch/powerpc/kernel/proc_powerpc.c index feb8580fd..b6fd8159e 100644 --- a/arch/powerpc/kernel/proc_powerpc.c +++ b/arch/powerpc/kernel/proc_powerpc.c @@ -24,7 +24,7 @@ #include <asm/machdep.h> #include <asm/vdso_datapage.h> #include <asm/rtas.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/prom.h> #ifdef CONFIG_PPC64 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 9310b80cf..63d13eba5 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -40,7 +40,7 @@ #include <linux/hw_breakpoint.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 64f7bd5b1..17b32f0ea 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -34,7 +34,7 @@ #include <linux/perf_event.h> #include <linux/context_tracking.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/switch_to.h> diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c index f51599e94..37a929838 100644 --- a/arch/powerpc/kernel/ptrace32.c +++ b/arch/powerpc/kernel/ptrace32.c @@ -29,7 +29,7 @@ #include <linux/signal.h> #include <linux/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/switch_to.h> diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c index 8777fb023..25b02ff36 100644 --- a/arch/powerpc/kernel/rtas-proc.c +++ b/arch/powerpc/kernel/rtas-proc.c @@ -24,7 +24,7 @@ #include <linux/bitops.h> #include <linux/rtc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/prom.h> diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index c0ac1fe6f..053b49a10 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -35,7 +35,7 @@ #include <asm/page.h> #include <asm/param.h> #include <asm/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/udbg.h> #include <asm/syscalls.h> #include <asm/smp.h> diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c index 2f3cdb015..683c296c5 100644 --- a/arch/powerpc/kernel/rtas_flash.c +++ b/arch/powerpc/kernel/rtas_flash.c @@ -19,7 +19,7 @@ #include <linux/proc_fs.h> #include <linux/reboot.h> #include <asm/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/rtas.h> #define MODULE_VERS "1.0" diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c index 1130c53ad..8333f8232 100644 --- a/arch/powerpc/kernel/rtasd.c +++ b/arch/powerpc/kernel/rtasd.c @@ -22,7 +22,7 @@ #include <linux/workqueue.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/rtas.h> #include <asm/prom.h> diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index a8f54ecb0..ffa96dfcf 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -29,7 +29,7 @@ #include <asm/bootx.h> #include <asm/btext.h> #include <asm/machdep.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pmac_feature.h> #include <asm/sections.h> #include <asm/nvram.h> diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index 457e97aa2..a68dc6efd 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -15,7 +15,7 @@ #include <linux/key.h> #include <linux/context_tracking.h> #include <asm/hw_breakpoint.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/debug.h> #include <asm/tm.h> diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 8220ae862..3965ee788 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -37,7 +37,7 @@ #include <linux/binfmts.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #include <asm/syscalls.h> #include <asm/sigcontext.h> diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 2419c1753..200b3729b 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c @@ -27,7 +27,7 @@ #include <asm/sigcontext.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/unistd.h> #include <asm/cacheflush.h> diff --git a/arch/powerpc/kernel/softemu8xx.c b/arch/powerpc/kernel/softemu8xx.c index 29b2f81dd..4cbe03f54 100644 --- a/arch/powerpc/kernel/softemu8xx.c +++ b/arch/powerpc/kernel/softemu8xx.c @@ -25,7 +25,7 @@ #include <linux/interrupt.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /* Eventually we may need a look-up table, but this works for now. diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index 8a285876a..15f216d02 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c @@ -44,7 +44,7 @@ #include <asm/ptrace.h> #include <asm/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/time.h> #include <asm/mmu_context.h> diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index 4e3cc47f2..dc7217621 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c @@ -37,7 +37,7 @@ #include <linux/init.h> #include <linux/personality.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/syscalls.h> #include <asm/time.h> #include <asm/unistd.h> diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 116b384aa..e90b596c7 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -60,7 +60,7 @@ #include <asm/nvram.h> #include <asm/cache.h> #include <asm/machdep.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/time.h> #include <asm/prom.h> #include <asm/irq.h> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 88929b1f4..646fe8ec5 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -39,7 +39,7 @@ #include <asm/emulated_ops.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/machdep.h> #include <asm/rtas.h> diff --git a/arch/powerpc/kernel/vecemu.c b/arch/powerpc/kernel/vecemu.c index 604d0947c..c1c2d7c22 100644 --- a/arch/powerpc/kernel/vecemu.c +++ b/arch/powerpc/kernel/vecemu.c @@ -7,7 +7,7 @@ #include <linux/sched.h> #include <asm/ptrace.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Functions in vector.S */ extern void vaddfp(vector128 *dst, vector128 *a, vector128 *b); diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 700df6f1d..65a2d1167 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -23,7 +23,7 @@ #include <asm/cputable.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h> diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 466fbd54e..c52c57dad 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -36,7 +36,7 @@ #include <asm/cputable.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h> diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index bdc40b8e7..063a2ac6a 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -28,7 +28,7 @@ #include <asm/cputable.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h> diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c index da0e0bc26..857b21438 100644 --- a/arch/powerpc/kvm/book3s_pr_papr.c +++ b/arch/powerpc/kvm/book3s_pr_papr.c @@ -17,7 +17,7 @@ #include <linux/anon_inodes.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h> diff --git a/arch/powerpc/kvm/book3s_rtas.c b/arch/powerpc/kvm/book3s_rtas.c index 3219ba895..d115b3505 100644 --- a/arch/powerpc/kvm/book3s_rtas.c +++ b/arch/powerpc/kvm/book3s_rtas.c @@ -11,7 +11,7 @@ #include <linux/kvm.h> #include <linux/err.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/kvm_book3s.h> #include <asm/kvm_ppc.h> #include <asm/hvcall.h> diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c index a3a5cb8ee..78f489855 100644 --- a/arch/powerpc/kvm/book3s_xics.c +++ b/arch/powerpc/kvm/book3s_xics.c @@ -13,7 +13,7 @@ #include <linux/gfp.h> #include <linux/anon_inodes.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/kvm_book3s.h> #include <asm/kvm_ppc.h> #include <asm/hvcall.h> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 1a1b51189..0b67621e6 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -30,7 +30,7 @@ #include <linux/fs.h> #include <asm/cputable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/kvm_ppc.h> #include <asm/cacheflush.h> #include <asm/dbell.h> diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c index 2861ae9ea..e90e4c594 100644 --- a/arch/powerpc/kvm/mpic.c +++ b/arch/powerpc/kvm/mpic.c @@ -29,7 +29,7 @@ #include <linux/errno.h> #include <linux/fs.h> #include <linux/anon_inodes.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mpic.h> #include <asm/kvm_para.h> #include <asm/kvm_host.h> diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 6316ee336..83de4b820 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -27,7 +27,7 @@ #include <linux/slab.h> #include <linux/file.h> #include <asm/cputable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/kvm_ppc.h> #include <asm/tlbflush.h> #include <asm/cputhreads.h> 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) { diff --git a/arch/powerpc/math-emu/fabs.c b/arch/powerpc/math-emu/fabs.c index 549baba59..a5e7ad138 100644 --- a/arch/powerpc/math-emu/fabs.c +++ b/arch/powerpc/math-emu/fabs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fabs(u32 *frD, u32 *frB) diff --git a/arch/powerpc/math-emu/fadd.c b/arch/powerpc/math-emu/fadd.c index 0158a16e2..29de37e0e 100644 --- a/arch/powerpc/math-emu/fadd.c +++ b/arch/powerpc/math-emu/fadd.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fadds.c b/arch/powerpc/math-emu/fadds.c index 5930f40a8..7093c5b58 100644 --- a/arch/powerpc/math-emu/fadds.c +++ b/arch/powerpc/math-emu/fadds.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c index 5bce011c2..5d6444672 100644 --- a/arch/powerpc/math-emu/fcmpo.c +++ b/arch/powerpc/math-emu/fcmpo.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fcmpu.c b/arch/powerpc/math-emu/fcmpu.c index d4fb1babc..0f9bf4864 100644 --- a/arch/powerpc/math-emu/fcmpu.c +++ b/arch/powerpc/math-emu/fcmpu.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fctiw.c b/arch/powerpc/math-emu/fctiw.c index f694440dd..716d6da7f 100644 --- a/arch/powerpc/math-emu/fctiw.c +++ b/arch/powerpc/math-emu/fctiw.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fctiwz.c b/arch/powerpc/math-emu/fctiwz.c index 71e782fd4..7212fa7cf 100644 --- a/arch/powerpc/math-emu/fctiwz.c +++ b/arch/powerpc/math-emu/fctiwz.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fdiv.c b/arch/powerpc/math-emu/fdiv.c index a29239c05..e1e452069 100644 --- a/arch/powerpc/math-emu/fdiv.c +++ b/arch/powerpc/math-emu/fdiv.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c index 526bc2612..5511e2d1c 100644 --- a/arch/powerpc/math-emu/fdivs.c +++ b/arch/powerpc/math-emu/fdivs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fmadd.c b/arch/powerpc/math-emu/fmadd.c index 8c3f20aa5..2b6fae0bc 100644 --- a/arch/powerpc/math-emu/fmadd.c +++ b/arch/powerpc/math-emu/fmadd.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fmadds.c b/arch/powerpc/math-emu/fmadds.c index 794fb31e5..aff35f24a 100644 --- a/arch/powerpc/math-emu/fmadds.c +++ b/arch/powerpc/math-emu/fmadds.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fmr.c b/arch/powerpc/math-emu/fmr.c index bd55384b8..f6347911f 100644 --- a/arch/powerpc/math-emu/fmr.c +++ b/arch/powerpc/math-emu/fmr.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fmr(u32 *frD, u32 *frB) diff --git a/arch/powerpc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c index 626f6fed8..1fb26cebe 100644 --- a/arch/powerpc/math-emu/fmsub.c +++ b/arch/powerpc/math-emu/fmsub.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c index 3425bc899..f73965453 100644 --- a/arch/powerpc/math-emu/fmsubs.c +++ b/arch/powerpc/math-emu/fmsubs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c index 2c1929779..ffd31b549 100644 --- a/arch/powerpc/math-emu/fmul.c +++ b/arch/powerpc/math-emu/fmul.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fmuls.c b/arch/powerpc/math-emu/fmuls.c index f5ad5c9c7..21aee431c 100644 --- a/arch/powerpc/math-emu/fmuls.c +++ b/arch/powerpc/math-emu/fmuls.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fnabs.c b/arch/powerpc/math-emu/fnabs.c index a7d34f3d9..af877a53d 100644 --- a/arch/powerpc/math-emu/fnabs.c +++ b/arch/powerpc/math-emu/fnabs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fnabs(u32 *frD, u32 *frB) diff --git a/arch/powerpc/math-emu/fneg.c b/arch/powerpc/math-emu/fneg.c index 1e988cd9c..8417d1747 100644 --- a/arch/powerpc/math-emu/fneg.c +++ b/arch/powerpc/math-emu/fneg.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fneg(u32 *frD, u32 *frB) diff --git a/arch/powerpc/math-emu/fnmadd.c b/arch/powerpc/math-emu/fnmadd.c index e817bc545..6316ef0e0 100644 --- a/arch/powerpc/math-emu/fnmadd.c +++ b/arch/powerpc/math-emu/fnmadd.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c index 4db4b7d9b..9ffe037df 100644 --- a/arch/powerpc/math-emu/fnmadds.c +++ b/arch/powerpc/math-emu/fnmadds.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fnmsub.c b/arch/powerpc/math-emu/fnmsub.c index f65979fa7..f97a9cfb5 100644 --- a/arch/powerpc/math-emu/fnmsub.c +++ b/arch/powerpc/math-emu/fnmsub.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fnmsubs.c b/arch/powerpc/math-emu/fnmsubs.c index 9021dacc0..7fa1217bd 100644 --- a/arch/powerpc/math-emu/fnmsubs.c +++ b/arch/powerpc/math-emu/fnmsubs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fres.c b/arch/powerpc/math-emu/fres.c index 10ecbd08b..211c30d01 100644 --- a/arch/powerpc/math-emu/fres.c +++ b/arch/powerpc/math-emu/fres.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fres(void *frD, void *frB) diff --git a/arch/powerpc/math-emu/frsp.c b/arch/powerpc/math-emu/frsp.c index ddcc14664..3e3bc73e2 100644 --- a/arch/powerpc/math-emu/frsp.c +++ b/arch/powerpc/math-emu/frsp.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/frsqrte.c b/arch/powerpc/math-emu/frsqrte.c index 1d0a3a0fd..7c2ce4375 100644 --- a/arch/powerpc/math-emu/frsqrte.c +++ b/arch/powerpc/math-emu/frsqrte.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int frsqrte(void *frD, void *frB) diff --git a/arch/powerpc/math-emu/fsel.c b/arch/powerpc/math-emu/fsel.c index 1b0c14498..32b62c6c7 100644 --- a/arch/powerpc/math-emu/fsel.c +++ b/arch/powerpc/math-emu/fsel.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fsqrt.c b/arch/powerpc/math-emu/fsqrt.c index a55fc7d49..0e2a34b61 100644 --- a/arch/powerpc/math-emu/fsqrt.c +++ b/arch/powerpc/math-emu/fsqrt.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c index 31dccbfc3..420cf19b5 100644 --- a/arch/powerpc/math-emu/fsqrts.c +++ b/arch/powerpc/math-emu/fsqrts.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fsub.c b/arch/powerpc/math-emu/fsub.c index 02c5dff45..feedd705c 100644 --- a/arch/powerpc/math-emu/fsub.c +++ b/arch/powerpc/math-emu/fsub.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/fsubs.c b/arch/powerpc/math-emu/fsubs.c index 5d9b18c35..741905140 100644 --- a/arch/powerpc/math-emu/fsubs.c +++ b/arch/powerpc/math-emu/fsubs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/lfd.c b/arch/powerpc/math-emu/lfd.c index 79ac76d59..d998a5074 100644 --- a/arch/powerpc/math-emu/lfd.c +++ b/arch/powerpc/math-emu/lfd.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/double.h> diff --git a/arch/powerpc/math-emu/lfs.c b/arch/powerpc/math-emu/lfs.c index 434ed27be..1ee10b83d 100644 --- a/arch/powerpc/math-emu/lfs.c +++ b/arch/powerpc/math-emu/lfs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c index 164d55935..90ac0a141 100644 --- a/arch/powerpc/math-emu/math.c +++ b/arch/powerpc/math-emu/math.c @@ -5,7 +5,7 @@ #include <linux/types.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/reg.h> #include <asm/sfp-machine.h> diff --git a/arch/powerpc/math-emu/math_efp.c b/arch/powerpc/math-emu/math_efp.c index a73f0884d..d6d87d5e8 100644 --- a/arch/powerpc/math-emu/math_efp.c +++ b/arch/powerpc/math-emu/math_efp.c @@ -21,7 +21,7 @@ #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/reg.h> #define FP_EX_BOOKE_E500_SPE diff --git a/arch/powerpc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c index e948d5708..8e8e72397 100644 --- a/arch/powerpc/math-emu/mcrfs.c +++ b/arch/powerpc/math-emu/mcrfs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/mffs.c b/arch/powerpc/math-emu/mffs.c index 5526cf96e..e00fdc22a 100644 --- a/arch/powerpc/math-emu/mffs.c +++ b/arch/powerpc/math-emu/mffs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/mtfsb0.c b/arch/powerpc/math-emu/mtfsb0.c index bc985585b..5ed3e7d50 100644 --- a/arch/powerpc/math-emu/mtfsb0.c +++ b/arch/powerpc/math-emu/mtfsb0.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/mtfsb1.c b/arch/powerpc/math-emu/mtfsb1.c index fe6ed5ac8..602aa16ed 100644 --- a/arch/powerpc/math-emu/mtfsb1.c +++ b/arch/powerpc/math-emu/mtfsb1.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c index dbce92e4f..c8f0f7ed3 100644 --- a/arch/powerpc/math-emu/mtfsf.c +++ b/arch/powerpc/math-emu/mtfsf.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/mtfsfi.c b/arch/powerpc/math-emu/mtfsfi.c index fd2acc268..5df30541a 100644 --- a/arch/powerpc/math-emu/mtfsfi.c +++ b/arch/powerpc/math-emu/mtfsfi.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/math-emu/stfd.c b/arch/powerpc/math-emu/stfd.c index 33a165c8d..6baeaec13 100644 --- a/arch/powerpc/math-emu/stfd.c +++ b/arch/powerpc/math-emu/stfd.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int stfd(void *frS, void *ea) diff --git a/arch/powerpc/math-emu/stfiwx.c b/arch/powerpc/math-emu/stfiwx.c index f15a35f67..9da7c5d1a 100644 --- a/arch/powerpc/math-emu/stfiwx.c +++ b/arch/powerpc/math-emu/stfiwx.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int stfiwx(u32 *frS, void *ea) diff --git a/arch/powerpc/math-emu/stfs.c b/arch/powerpc/math-emu/stfs.c index 612214735..62bd25264 100644 --- a/arch/powerpc/math-emu/stfs.c +++ b/arch/powerpc/math-emu/stfs.c @@ -1,6 +1,6 @@ #include <linux/types.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sfp-machine.h> #include <math-emu/soft-fp.h> diff --git a/arch/powerpc/mm/40x_mmu.c b/arch/powerpc/mm/40x_mmu.c index 581096751..ec6e78600 100644 --- a/arch/powerpc/mm/40x_mmu.c +++ b/arch/powerpc/mm/40x_mmu.c @@ -43,7 +43,7 @@ #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/mmu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/smp.h> #include <asm/bootx.h> #include <asm/machdep.h> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index d51a0c110..182622257 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -39,7 +39,7 @@ #include <asm/pgtable.h> #include <asm/mmu.h> #include <asm/mmu_context.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlbflush.h> #include <asm/siginfo.h> #include <asm/debug.h> diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c index 07ba45b0f..f1d908526 100644 --- a/arch/powerpc/mm/fsl_booke_mmu.c +++ b/arch/powerpc/mm/fsl_booke_mmu.c @@ -48,7 +48,7 @@ #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/mmu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/smp.h> #include <asm/machdep.h> #include <asm/setup.h> diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 448117266..ea2b00eda 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -41,7 +41,7 @@ #include <asm/mmu_context.h> #include <asm/page.h> #include <asm/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/machdep.h> #include <asm/prom.h> #include <asm/tlbflush.h> diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index a90b9c458..ac548ad4b 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -52,7 +52,7 @@ #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/mmu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/smp.h> #include <asm/machdep.h> #include <asm/tlb.h> diff --git a/arch/powerpc/mm/subpage-prot.c b/arch/powerpc/mm/subpage-prot.c index 7c415ddde..616107307 100644 --- a/arch/powerpc/mm/subpage-prot.c +++ b/arch/powerpc/mm/subpage-prot.c @@ -15,7 +15,7 @@ #include <linux/hugetlb.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlbflush.h> /* diff --git a/arch/powerpc/oprofile/backtrace.c b/arch/powerpc/oprofile/backtrace.c index f75301f2c..61bb1e7ef 100644 --- a/arch/powerpc/oprofile/backtrace.c +++ b/arch/powerpc/oprofile/backtrace.c @@ -10,7 +10,7 @@ #include <linux/oprofile.h> #include <linux/sched.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/compat.h> #define STACK_SP(STACK) *(STACK) diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c index c9500ea7b..8a1945273 100644 --- a/arch/powerpc/platforms/cell/spufs/coredump.c +++ b/arch/powerpc/platforms/cell/spufs/coredump.c @@ -28,7 +28,7 @@ #include <linux/list.h> #include <linux/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "spufs.h" diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index 90986923a..e379a8e5a 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c @@ -35,7 +35,7 @@ #include <asm/time.h> #include <asm/spu.h> #include <asm/spu_info.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "spufs.h" #include "sputrace.h" diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index c5c5788e8..ffd34696b 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c @@ -38,7 +38,7 @@ #include <asm/prom.h> #include <asm/spu.h> #include <asm/spu_priv1.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "spufs.h" diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c index b045fdda4..40820e951 100644 --- a/arch/powerpc/platforms/cell/spufs/syscalls.c +++ b/arch/powerpc/platforms/cell/spufs/syscalls.c @@ -5,7 +5,7 @@ #include <linux/namei.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "spufs.h" diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c index d3ceff04f..85a261374 100644 --- a/arch/powerpc/platforms/chrp/nvram.c +++ b/arch/powerpc/platforms/chrp/nvram.c @@ -13,7 +13,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/spinlock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/prom.h> #include <asm/machdep.h> #include <asm/rtas.h> diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c index c63853575..594542dc1 100644 --- a/arch/powerpc/platforms/pseries/cmm.c +++ b/arch/powerpc/platforms/pseries/cmm.c @@ -38,7 +38,7 @@ #include <asm/hvcall.h> #include <asm/mmu.h> #include <asm/pgalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/memory.h> #include "plpar_wrappers.h" diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index a1a7b9a67..cbe97ea64 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c @@ -21,7 +21,7 @@ #include <asm/prom.h> #include <asm/machdep.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/rtas.h> struct cc_workarea { diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c index 0cc0ac07a..f37560592 100644 --- a/arch/powerpc/platforms/pseries/dtl.c +++ b/arch/powerpc/platforms/pseries/dtl.c @@ -25,7 +25,7 @@ #include <linux/debugfs.h> #include <linux/spinlock.h> #include <asm/smp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/firmware.h> #include <asm/lppaca.h> #include <asm/debug.h> diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c index 7664839f8..6c00dc8ec 100644 --- a/arch/powerpc/platforms/pseries/nvram.c +++ b/arch/powerpc/platforms/pseries/nvram.c @@ -20,7 +20,7 @@ #include <linux/kmsg_dump.h> #include <linux/ctype.h> #include <linux/zlib.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/nvram.h> #include <asm/rtas.h> #include <asm/prom.h> diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index f93cdf556..8c57c34c4 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c @@ -20,7 +20,7 @@ #include <asm/prom.h> #include <asm/machdep.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu.h> /** diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c index b502ab61a..a39a9b052 100644 --- a/arch/powerpc/platforms/pseries/scanlog.c +++ b/arch/powerpc/platforms/pseries/scanlog.c @@ -27,7 +27,7 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/rtas.h> #include <asm/prom.h> diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c index 188012c58..623370b73 100644 --- a/arch/powerpc/sysdev/tsi108_pci.c +++ b/arch/powerpc/sysdev/tsi108_pci.c @@ -30,7 +30,7 @@ #include <asm/byteorder.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/machdep.h> #include <asm/pci-bridge.h> #include <asm/tsi108.h> diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index 87a22092b..0042832df 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c @@ -28,7 +28,7 @@ #include <linux/platform_device.h> #include <asm/appldata.h> #include <asm/vtimer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/smp.h> diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c index 05ab88249..5ac293fb2 100644 --- a/arch/s390/boot/compressed/misc.c +++ b/arch/s390/boot/compressed/misc.c @@ -6,7 +6,7 @@ * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/ipl.h> #include "sizes.h" diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c index 94a35a4c1..4424f37d6 100644 --- a/arch/s390/crypto/prng.c +++ b/arch/s390/crypto/prng.c @@ -12,7 +12,7 @@ #include <linux/random.h> #include <linux/slab.h> #include <asm/debug.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "crypt_s390.h" diff --git a/arch/s390/include/asm/checksum.h b/arch/s390/include/asm/checksum.h index 4f57a4f39..ac19c9ef4 100644 --- a/arch/s390/include/asm/checksum.h +++ b/arch/s390/include/asm/checksum.h @@ -11,7 +11,7 @@ #ifndef _S390_CHECKSUM_H #define _S390_CHECKSUM_H -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * computes the checksum of a memory block at buff, length len, diff --git a/arch/s390/include/asm/idals.h b/arch/s390/include/asm/idals.h index ea5a6e45f..7c481e4b9 100644 --- a/arch/s390/include/asm/idals.h +++ b/arch/s390/include/asm/idals.h @@ -17,7 +17,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <asm/cio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_64BIT #define IDA_SIZE_LOG 12 /* 11 for 2k , 12 for 4k */ diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h index 084e7755e..c61c107e5 100644 --- a/arch/s390/include/asm/mmu_context.h +++ b/arch/s390/include/asm/mmu_context.h @@ -8,7 +8,7 @@ #define __S390_MMU_CONTEXT_H #include <asm/pgalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlbflush.h> #include <asm/ctl_reg.h> diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index a98afed93..b80f98416 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c @@ -51,7 +51,7 @@ #include <linux/slab.h> #include <asm/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/scm.h> #include <net/sock.h> diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index c439ac9ce..75bf52e15 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c @@ -23,7 +23,7 @@ #include <linux/personality.h> #include <linux/binfmts.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/lowcore.h> #include <asm/switch_to.h> #include "compat_linux.h" diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index f1279dc2e..ba4bb8787 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c @@ -19,7 +19,7 @@ #include <linux/ctype.h> #include <linux/string.h> #include <linux/sysctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/init.h> #include <linux/fs.h> diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c index be87d3e05..9c8e17419 100644 --- a/arch/s390/kernel/dis.c +++ b/arch/s390/kernel/dis.c @@ -22,7 +22,7 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/atomic.h> #include <asm/mathemu.h> diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 451be857d..4642cda88 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c @@ -26,7 +26,7 @@ #include <asm/page.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/switch_to.h> #include "entry.h" diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 8ad941314..202ad451f 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -47,7 +47,7 @@ #include <linux/compat.h> #include <asm/ipl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/facility.h> #include <asm/smp.h> #include <asm/mmu_context.h> diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index c45becf82..97c5e86bb 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c @@ -26,7 +26,7 @@ #include <linux/syscalls.h> #include <linux/compat.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/lowcore.h> #include <asm/switch_to.h> #include "entry.h" diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index 23eb222c1..8d98577ea 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -27,7 +27,7 @@ #include <linux/personality.h> #include <linux/unistd.h> #include <linux/ipc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "entry.h" /* diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 876546b9c..9c8c8ee18 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -38,7 +38,7 @@ #include <linux/clockchips.h> #include <linux/gfp.h> #include <linux/kprobes.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/delay.h> #include <asm/div64.h> #include <asm/vdso.h> diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h index 302e0e52b..ccbd5f1ca 100644 --- a/arch/s390/kvm/gaccess.h +++ b/arch/s390/kvm/gaccess.h @@ -15,7 +15,7 @@ #include <linux/compiler.h> #include <linux/kvm_host.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kvm-s390.h" static inline void __user *__gptr_to_uptr(struct kvm_vcpu *vcpu, diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index bc79ab005..5fe17be38 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -16,7 +16,7 @@ #include <linux/signal.h> #include <linux/slab.h> #include <asm/asm-offsets.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kvm-s390.h" #include "gaccess.h" #include "trace-s390.h" diff --git a/arch/s390/lib/uaccess_mvcos.c b/arch/s390/lib/uaccess_mvcos.c index 1829742bf..0c52fb178 100644 --- a/arch/s390/lib/uaccess_mvcos.c +++ b/arch/s390/lib/uaccess_mvcos.c @@ -8,7 +8,7 @@ #include <linux/errno.h> #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/futex.h> #include "uaccess.h" diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c index 1bf40ef57..b2deaf099 100644 --- a/arch/s390/lib/uaccess_pt.c +++ b/arch/s390/lib/uaccess_pt.c @@ -10,7 +10,7 @@ #include <linux/hardirq.h> #include <linux/mm.h> #include <linux/hugetlb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/futex.h> #include "uaccess.h" diff --git a/arch/s390/math-emu/math.c b/arch/s390/math-emu/math.c index 58bff541f..945280ae9 100644 --- a/arch/s390/math-emu/math.c +++ b/arch/s390/math-emu/math.c @@ -10,7 +10,7 @@ #include <linux/types.h> #include <linux/sched.h> #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/lowcore.h> #include <asm/sfp-util.h> diff --git a/arch/s390/mm/extable.c b/arch/s390/mm/extable.c index 18c8b819b..4c420a0c3 100644 --- a/arch/s390/mm/extable.c +++ b/arch/s390/mm/extable.c @@ -1,6 +1,6 @@ #include <linux/module.h> #include <linux/sort.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Search one exception table for an entry corresponding to the diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index eba15f18f..fd98dbe3c 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -28,7 +28,7 @@ #include <linux/export.h> #include <linux/gfp.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> #include <asm/dma.h> diff --git a/arch/score/include/asm/checksum.h b/arch/score/include/asm/checksum.h index 961bd6401..24d3fd84d 100644 --- a/arch/score/include/asm/checksum.h +++ b/arch/score/include/asm/checksum.h @@ -2,7 +2,7 @@ #define _ASM_SCORE_CHECKSUM_H #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/score/include/asm/module.h b/arch/score/include/asm/module.h index abf395bbf..7316b2010 100644 --- a/arch/score/include/asm/module.h +++ b/arch/score/include/asm/module.h @@ -2,7 +2,7 @@ #define _ASM_SCORE_MODULE_H #include <linux/list.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm-generic/module.h> struct mod_arch_specific { diff --git a/arch/score/kernel/ptrace.c b/arch/score/kernel/ptrace.c index 55836188b..18c01570d 100644 --- a/arch/score/kernel/ptrace.c +++ b/arch/score/kernel/ptrace.c @@ -29,7 +29,7 @@ #include <linux/ptrace.h> #include <linux/regset.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * retrieve the contents of SCORE userspace general registers diff --git a/arch/score/lib/checksum_copy.c b/arch/score/lib/checksum_copy.c index 04565dd3d..e0d4bf2f4 100644 --- a/arch/score/lib/checksum_copy.c +++ b/arch/score/lib/checksum_copy.c @@ -25,7 +25,7 @@ #include <net/checksum.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> unsigned int csum_partial_copy(const char *src, char *dst, int len, unsigned int sum) diff --git a/arch/sh/boards/mach-landisk/gio.c b/arch/sh/boards/mach-landisk/gio.c index 8132dff07..32c317f5d 100644 --- a/arch/sh/boards/mach-landisk/gio.c +++ b/arch/sh/boards/mach-landisk/gio.c @@ -18,7 +18,7 @@ #include <linux/cdev.h> #include <linux/fs.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach-landisk/mach/gio.h> #include <mach-landisk/mach/iodata_landisk.h> diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c index 95470a472..6a406527c 100644 --- a/arch/sh/boot/compressed/misc.c +++ b/arch/sh/boot/compressed/misc.c @@ -11,7 +11,7 @@ * Modified to use standard LinuxSH BIOS by Greg Banks 7Jul2000 */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/addrspace.h> #include <asm/page.h> diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h index 21c508878..0011bb141 100644 --- a/arch/sh/include/asm/mmu_context.h +++ b/arch/sh/include/asm/mmu_context.h @@ -10,7 +10,7 @@ #ifdef __KERNEL__ #include <cpu/mmu_context.h> #include <asm/tlbflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm-generic/mm_hooks.h> diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c index 0a2ef460e..de51ef995 100644 --- a/arch/sh/kernel/cpu/init.c +++ b/arch/sh/kernel/cpu/init.c @@ -16,7 +16,7 @@ #include <linux/log2.h> #include <asm/mmu_context.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/cacheflush.h> #include <asm/cache.h> diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c index d30622592..b70d423b6 100644 --- a/arch/sh/kernel/cpu/shmobile/cpuidle.c +++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c @@ -16,7 +16,7 @@ #include <linux/cpuidle.h> #include <linux/export.h> #include <asm/suspend.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static unsigned long cpuidle_mode[] = { SUSP_SH_SLEEP, /* regular sleep mode */ diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c index ac37b7234..fba2be5d7 100644 --- a/arch/sh/kernel/cpu/shmobile/pm.c +++ b/arch/sh/kernel/cpu/shmobile/pm.c @@ -14,7 +14,7 @@ #include <linux/io.h> #include <linux/suspend.h> #include <asm/suspend.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #include <asm/bl_bit.h> diff --git a/arch/sh/kernel/crash_dump.c b/arch/sh/kernel/crash_dump.c index 569e7b171..b33be5053 100644 --- a/arch/sh/kernel/crash_dump.c +++ b/arch/sh/kernel/crash_dump.c @@ -7,7 +7,7 @@ #include <linux/errno.h> #include <linux/crash_dump.h> #include <linux/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /** * copy_oldmem_page - copy one page from "oldmem" diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c index c0a9761f2..46d89eb64 100644 --- a/arch/sh/kernel/io_trapped.c +++ b/arch/sh/kernel/io_trapped.c @@ -16,7 +16,7 @@ #include <linux/module.h> #include <linux/init.h> #include <asm/mmu_context.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/io_trapped.h> diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 063af10ff..6e603378c 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -16,7 +16,7 @@ #include <linux/ratelimit.h> #include <asm/processor.h> #include <asm/machvec.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/thread_info.h> #include <cpu/mmu_context.h> diff --git a/arch/sh/kernel/kprobes.c b/arch/sh/kernel/kprobes.c index 42b46e61a..19e08d275 100644 --- a/arch/sh/kernel/kprobes.c +++ b/arch/sh/kernel/kprobes.c @@ -15,7 +15,7 @@ #include <linux/kdebug.h> #include <linux/slab.h> #include <asm/cacheflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c index ebd393300..48406768f 100644 --- a/arch/sh/kernel/process_32.c +++ b/arch/sh/kernel/process_32.c @@ -23,7 +23,7 @@ #include <linux/hw_breakpoint.h> #include <linux/prefetch.h> #include <linux/stackprotector.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/fpu.h> #include <asm/syscalls.h> diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index 174d124b4..0ce9d96a4 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c @@ -26,7 +26,7 @@ #include <linux/module.h> #include <linux/io.h> #include <asm/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/mmu_context.h> #include <asm/fpu.h> diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c index 81f999a67..8ade79c7d 100644 --- a/arch/sh/kernel/ptrace_32.c +++ b/arch/sh/kernel/ptrace_32.c @@ -26,7 +26,7 @@ #include <linux/elf.h> #include <linux/regset.h> #include <linux/hw_breakpoint.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/mmu_context.h> diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c index af90339da..c27a23e6a 100644 --- a/arch/sh/kernel/ptrace_64.c +++ b/arch/sh/kernel/ptrace_64.c @@ -32,7 +32,7 @@ #include <linux/elf.h> #include <linux/regset.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/mmu_context.h> diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 1cf90e947..cf8f00bdc 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -29,7 +29,7 @@ #include <linux/delay.h> #include <linux/platform_device.h> #include <linux/memblock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/page.h> #include <asm/elf.h> diff --git a/arch/sh/kernel/sh_ksyms_64.c b/arch/sh/kernel/sh_ksyms_64.c index 26a0774f5..6ee3740e0 100644 --- a/arch/sh/kernel/sh_ksyms_64.c +++ b/arch/sh/kernel/sh_ksyms_64.c @@ -18,7 +18,7 @@ #include <linux/screen_info.h> #include <asm/cacheflush.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> #include <asm/delay.h> diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c index 6af6e7c5c..bb6e3a38f 100644 --- a/arch/sh/kernel/signal_32.c +++ b/arch/sh/kernel/signal_32.c @@ -25,7 +25,7 @@ #include <linux/io.h> #include <linux/tracehook.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/cacheflush.h> #include <asm/syscalls.h> diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c index 23d4c71c9..bca83c673 100644 --- a/arch/sh/kernel/signal_64.c +++ b/arch/sh/kernel/signal_64.c @@ -23,7 +23,7 @@ #include <linux/stddef.h> #include <linux/tracehook.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/cacheflush.h> #include <asm/fpu.h> diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index 8c6a350df..6576e5ee1 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c @@ -23,7 +23,7 @@ #include <linux/fs.h> #include <linux/ipc.h> #include <asm/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/cacheflush.h> #include <asm/cachectl.h> diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c index 497bab3a0..44d0f7247 100644 --- a/arch/sh/kernel/sys_sh32.c +++ b/arch/sh/kernel/sys_sh32.c @@ -13,7 +13,7 @@ #include <linux/fs.h> #include <linux/ipc.h> #include <asm/cacheflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/syscalls.h> diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c index 112ea11c0..dee9b0dbb 100644 --- a/arch/sh/kernel/traps_64.c +++ b/arch/sh/kernel/traps_64.c @@ -25,7 +25,7 @@ #include <linux/sysctl.h> #include <linux/module.h> #include <linux/perf_event.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/alignment.h> #include <asm/processor.h> diff --git a/arch/sh/math-emu/math.c b/arch/sh/math-emu/math.c index b876780c1..2b01e302f 100644 --- a/arch/sh/math-emu/math.c +++ b/arch/sh/math-emu/math.c @@ -14,7 +14,7 @@ #include <linux/signal.h> #include <linux/perf_event.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c index 115725198..d2933c675 100644 --- a/arch/sh/mm/cache-debugfs.c +++ b/arch/sh/mm/cache-debugfs.c @@ -12,7 +12,7 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cache.h> #include <asm/io.h> diff --git a/arch/sh/mm/cache-sh3.c b/arch/sh/mm/cache-sh3.c index e37523f65..031634f27 100644 --- a/arch/sh/mm/cache-sh3.c +++ b/arch/sh/mm/cache-sh3.c @@ -17,7 +17,7 @@ #include <asm/processor.h> #include <asm/cache.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h> diff --git a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c index d1bffbcd9..d94dadedf 100644 --- a/arch/sh/mm/cache-sh5.c +++ b/arch/sh/mm/cache-sh5.c @@ -17,7 +17,7 @@ #include <asm/processor.h> #include <asm/cache.h> #include <asm/pgalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> extern void __weak sh4__flush_region_init(void); diff --git a/arch/sh/mm/cache-sh7705.c b/arch/sh/mm/cache-sh7705.c index 7729cca72..6cd2aa395 100644 --- a/arch/sh/mm/cache-sh7705.c +++ b/arch/sh/mm/cache-sh7705.c @@ -20,7 +20,7 @@ #include <asm/processor.h> #include <asm/cache.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h> diff --git a/arch/sh/mm/extable_32.c b/arch/sh/mm/extable_32.c index c1cf4463d..9cfcbb584 100644 --- a/arch/sh/mm/extable_32.c +++ b/arch/sh/mm/extable_32.c @@ -5,7 +5,7 @@ */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) { diff --git a/arch/sh/mm/extable_64.c b/arch/sh/mm/extable_64.c index f05499688..96edaff8c 100644 --- a/arch/sh/mm/extable_64.c +++ b/arch/sh/mm/extable_64.c @@ -12,7 +12,7 @@ */ #include <linux/rwsem.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern unsigned long copy_user_memcpy, copy_user_memcpy_end; extern void __copy_user_fixup(void); diff --git a/arch/sh/mm/nommu.c b/arch/sh/mm/nommu.c index 36312d254..82f8197b9 100644 --- a/arch/sh/mm/nommu.c +++ b/arch/sh/mm/nommu.c @@ -14,7 +14,7 @@ #include <asm/pgtable.h> #include <asm/tlbflush.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Nothing too terribly exciting here .. diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c index 7160c9fd6..7b2cc490e 100644 --- a/arch/sh/mm/pmb.c +++ b/arch/sh/mm/pmb.c @@ -25,7 +25,7 @@ #include <linux/vmalloc.h> #include <asm/cacheflush.h> #include <asm/sizes.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/page.h> #include <asm/mmu.h> diff --git a/arch/sh/mm/tlb-sh3.c b/arch/sh/mm/tlb-sh3.c index 6554fb439..5c66665bf 100644 --- a/arch/sh/mm/tlb-sh3.c +++ b/arch/sh/mm/tlb-sh3.c @@ -21,7 +21,7 @@ #include <linux/interrupt.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h> diff --git a/arch/sh/mm/tlbex_64.c b/arch/sh/mm/tlbex_64.c index 8557548fc..8ff966dd0 100644 --- a/arch/sh/mm/tlbex_64.c +++ b/arch/sh/mm/tlbex_64.c @@ -36,7 +36,7 @@ #include <linux/kprobes.h> #include <asm/tlb.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/mmu_context.h> diff --git a/arch/sh/mm/tlbflush_64.c b/arch/sh/mm/tlbflush_64.c index f33fdd255..bd0715d5d 100644 --- a/arch/sh/mm/tlbflush_64.c +++ b/arch/sh/mm/tlbflush_64.c @@ -24,7 +24,7 @@ #include <linux/interrupt.h> #include <asm/io.h> #include <asm/tlb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/mmu_context.h> diff --git a/arch/sh/oprofile/backtrace.c b/arch/sh/oprofile/backtrace.c index 9c88dcd56..c7695f99c 100644 --- a/arch/sh/oprofile/backtrace.c +++ b/arch/sh/oprofile/backtrace.c @@ -19,7 +19,7 @@ #include <linux/mm.h> #include <asm/unwinder.h> #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sections.h> #include <asm/stacktrace.h> diff --git a/arch/sparc/include/asm/checksum_32.h b/arch/sparc/include/asm/checksum_32.h index bdbda1453..03899167b 100644 --- a/arch/sparc/include/asm/checksum_32.h +++ b/arch/sparc/include/asm/checksum_32.h @@ -16,7 +16,7 @@ */ #include <linux/in6.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* computes the checksum of a memory block at buff, length len, * and adds in "sum" (32-bit) diff --git a/arch/sparc/include/asm/checksum_64.h b/arch/sparc/include/asm/checksum_64.h index 019b9615e..d22ee786c 100644 --- a/arch/sparc/include/asm/checksum_64.h +++ b/arch/sparc/include/asm/checksum_64.h @@ -16,7 +16,7 @@ */ #include <linux/in6.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* computes the checksum of a memory block at buff, length len, * and adds in "sum" (32-bit) diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h index 370ca1e71..16e9e69d3 100644 --- a/arch/sparc/include/asm/elf_64.h +++ b/arch/sparc/include/asm/elf_64.h @@ -7,7 +7,7 @@ #include <asm/ptrace.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/spitfire.h> /* diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c index eefda32b5..4aa22e92d 100644 --- a/arch/sparc/kernel/apc.c +++ b/arch/sparc/kernel/apc.c @@ -17,7 +17,7 @@ #include <asm/io.h> #include <asm/oplib.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/auxio.h> #include <asm/apc.h> #include <asm/processor.h> diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index d16d16520..952cb05a1 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c @@ -35,7 +35,7 @@ #include <asm/timer.h> #include <asm/smp.h> #include <asm/starfire.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cache.h> #include <asm/cpudata.h> #include <asm/auxio.h> diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c index e72212148..420069df9 100644 --- a/arch/sparc/kernel/kprobes.c +++ b/arch/sparc/kernel/kprobes.c @@ -10,7 +10,7 @@ #include <linux/slab.h> #include <asm/signal.h> #include <asm/cacheflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* We do not have hardware single-stepping on sparc64. * So we implement software single-stepping with breakpoint diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c index 3961054c5..a9645c38f 100644 --- a/arch/sparc/kernel/mdesc.c +++ b/arch/sparc/kernel/mdesc.c @@ -17,7 +17,7 @@ #include <asm/hypervisor.h> #include <asm/mdesc.h> #include <asm/prom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/oplib.h> #include <asm/smp.h> diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 906cbf0f8..fff89450b 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -21,7 +21,7 @@ #include <linux/of.h> #include <linux/of_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/irq.h> #include <asm/prom.h> diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 09f4fdd8d..ba72aa221 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c @@ -33,7 +33,7 @@ #include <asm/pcic.h> #include <asm/timex.h> #include <asm/timer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq_regs.h> #include "irq.h" diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index d461b7ddf..c9ea486cf 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c @@ -21,7 +21,7 @@ #include <asm/stacktrace.h> #include <asm/cpudata.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include <asm/nmi.h> #include <asm/pcr.h> diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c index 8b7297fac..f5b99d589 100644 --- a/arch/sparc/kernel/pmc.c +++ b/arch/sparc/kernel/pmc.c @@ -15,7 +15,7 @@ #include <asm/io.h> #include <asm/oplib.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/auxio.h> #include <asm/processor.h> diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index fdd819dfd..bf2e518b4 100644 --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c @@ -27,7 +27,7 @@ #include <asm/auxio.h> #include <asm/oplib.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index 036e43cef..81fc270ea 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c @@ -32,7 +32,7 @@ #include <linux/sysrq.h> #include <linux/nmi.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c index 896ba7c5c..6054131c2 100644 --- a/arch/sparc/kernel/ptrace_32.c +++ b/arch/sparc/kernel/ptrace_32.c @@ -23,7 +23,7 @@ #include <linux/tracehook.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> /* #define ALLOW_INIT_TRACING */ diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c index 875ddf00d..4cec8189b 100644 --- a/arch/sparc/kernel/ptrace_64.c +++ b/arch/sparc/kernel/ptrace_64.c @@ -29,7 +29,7 @@ #include <asm/asi.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/psrcompat.h> #include <asm/visasm.h> #include <asm/spitfire.h> diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c index b524f91dd..1878858fb 100644 --- a/arch/sparc/kernel/signal32.c +++ b/arch/sparc/kernel/signal32.c @@ -21,7 +21,7 @@ #include <linux/bitops.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ptrace.h> #include <asm/pgtable.h> #include <asm/psrcompat.h> diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c index 7d5d8e1f8..87a277590 100644 --- a/arch/sparc/kernel/signal_32.c +++ b/arch/sparc/kernel/signal_32.c @@ -20,7 +20,7 @@ #include <linux/bitops.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ptrace.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c index 35923e8ab..a22d41d19 100644 --- a/arch/sparc/kernel/signal_64.c +++ b/arch/sparc/kernel/signal_64.c @@ -24,7 +24,7 @@ #include <linux/binfmts.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ptrace.h> #include <asm/pgtable.h> #include <asm/fpumacro.h> diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index 7c3d82107..cb83243fe 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c @@ -41,7 +41,7 @@ #include <asm/page.h> #include <asm/pgtable.h> #include <asm/oplib.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/starfire.h> #include <asm/tlb.h> #include <asm/sections.h> diff --git a/arch/sparc/kernel/sparc_ksyms_32.c b/arch/sparc/kernel/sparc_ksyms_32.c index e521c5456..4214291c5 100644 --- a/arch/sparc/kernel/sparc_ksyms_32.c +++ b/arch/sparc/kernel/sparc_ksyms_32.c @@ -9,7 +9,7 @@ #include <linux/init.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/delay.h> #include <asm/head.h> #include <asm/dma.h> diff --git a/arch/sparc/kernel/sparc_ksyms_64.c b/arch/sparc/kernel/sparc_ksyms_64.c index 9f5e24ddc..69114b99e 100644 --- a/arch/sparc/kernel/sparc_ksyms_64.c +++ b/arch/sparc/kernel/sparc_ksyms_64.c @@ -11,7 +11,7 @@ #include <linux/bitops.h> #include <asm/cpudata.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/spitfire.h> #include <asm/oplib.h> #include <asm/hypervisor.h> diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c index 3d0ddbc00..9a0c6151a 100644 --- a/arch/sparc/kernel/sys_sparc32.c +++ b/arch/sparc/kernel/sys_sparc32.c @@ -44,7 +44,7 @@ #include <linux/slab.h> #include <asm/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/fpumacro.h> #include <asm/mmu_context.h> #include <asm/compat_signal.h> diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c index 3a8d18444..513516221 100644 --- a/arch/sparc/kernel/sys_sparc_32.c +++ b/arch/sparc/kernel/sys_sparc_32.c @@ -21,7 +21,7 @@ #include <linux/smp.h> #include <linux/ipc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> /* #define DEBUG_UNIMP_SYSCALL */ diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index b52211027..b41c5bc53 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -25,7 +25,7 @@ #include <linux/random.h> #include <linux/export.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/utrap.h> #include <asm/unistd.h> diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index c3d82b5f5..56c331808 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c @@ -46,7 +46,7 @@ #include <asm/smp.h> #include <asm/sections.h> #include <asm/cpudata.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq_regs.h> #include "entry.h" diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index b3f833ab9..6c5270f0c 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c @@ -28,7 +28,7 @@ #include <asm/page.h> #include <asm/pgtable.h> #include <asm/unistd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/fpumacro.h> #include <asm/lsu.h> #include <asm/dcu.h> diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c index c0ec89786..6262e4f51 100644 --- a/arch/sparc/kernel/unaligned_32.c +++ b/arch/sparc/kernel/unaligned_32.c @@ -12,7 +12,7 @@ #include <linux/mm.h> #include <asm/ptrace.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/smp.h> #include <linux/perf_event.h> diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c index 4db889819..33eb31118 100644 --- a/arch/sparc/kernel/unaligned_64.c +++ b/arch/sparc/kernel/unaligned_64.c @@ -16,7 +16,7 @@ #include <asm/ptrace.h> #include <asm/pstate.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/smp.h> #include <linux/bitops.h> #include <linux/perf_event.h> diff --git a/arch/sparc/kernel/visemul.c b/arch/sparc/kernel/visemul.c index c096c624a..c4ac58e48 100644 --- a/arch/sparc/kernel/visemul.c +++ b/arch/sparc/kernel/visemul.c @@ -10,7 +10,7 @@ #include <asm/ptrace.h> #include <asm/pstate.h> #include <asm/fpumacro.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> /* OPF field of various VIS instructions. */ diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c index 3107381e5..4ef6f1817 100644 --- a/arch/sparc/kernel/windows.c +++ b/arch/sparc/kernel/windows.c @@ -10,7 +10,7 @@ #include <linux/mm.h> #include <linux/smp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Do save's until all user register windows are out of the cpu. */ void flush_user_windows(void) diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c index ac094de28..a628376dd 100644 --- a/arch/sparc/lib/ksyms.c +++ b/arch/sparc/lib/ksyms.c @@ -10,7 +10,7 @@ #include <linux/types.h> #include <asm/checksum.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ftrace.h> /* string functions */ diff --git a/arch/sparc/lib/user_fixup.c b/arch/sparc/lib/user_fixup.c index ac96ae236..479991012 100644 --- a/arch/sparc/lib/user_fixup.c +++ b/arch/sparc/lib/user_fixup.c @@ -9,7 +9,7 @@ #include <linux/errno.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Calculating the exact fault address when using * block loads and stores can be very complicated. diff --git a/arch/sparc/math-emu/math_32.c b/arch/sparc/math-emu/math_32.c index 5ce8f2f64..4d7e0fff0 100644 --- a/arch/sparc/math-emu/math_32.c +++ b/arch/sparc/math-emu/math_32.c @@ -68,7 +68,7 @@ #include <linux/sched.h> #include <linux/mm.h> #include <linux/perf_event.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sfp-util_32.h" #include <math-emu/soft-fp.h> diff --git a/arch/sparc/math-emu/math_64.c b/arch/sparc/math-emu/math_64.c index 034aadbff..964705185 100644 --- a/arch/sparc/math-emu/math_64.c +++ b/arch/sparc/math-emu/math_64.c @@ -15,7 +15,7 @@ #include <asm/fpumacro.h> #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #include "sfp-util_64.h" diff --git a/arch/sparc/mm/extable.c b/arch/sparc/mm/extable.c index a61c34944..768a11e6b 100644 --- a/arch/sparc/mm/extable.c +++ b/arch/sparc/mm/extable.c @@ -3,7 +3,7 @@ */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> void sort_extable(struct exception_table_entry *start, struct exception_table_entry *finish) diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c index 163c78712..2919e8a48 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -28,7 +28,7 @@ #include <asm/oplib.h> #include <asm/smp.h> #include <asm/traps.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int show_unhandled_signals = 1; diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index ac2db923e..d1f58b814 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c @@ -26,7 +26,7 @@ #include <asm/pgtable.h> #include <asm/openprom.h> #include <asm/oplib.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/asi.h> #include <asm/lsu.h> #include <asm/sections.h> diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 668b6ccbc..dc807d71d 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -34,7 +34,7 @@ #include <asm/oplib.h> #include <asm/iommu.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h> #include <asm/dma.h> diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c index 2d0266d02..6dd1a1064 100644 --- a/arch/um/drivers/harddog_kern.c +++ b/arch/um/drivers/harddog_kern.c @@ -45,7 +45,7 @@ #include <linux/mutex.h> #include <linux/init.h> #include <linux/spinlock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mconsole.h" MODULE_LICENSE("GPL"); diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c index 9b90fdc4b..4b9e54a56 100644 --- a/arch/um/drivers/hostaudio_kern.c +++ b/arch/um/drivers/hostaudio_kern.c @@ -9,7 +9,7 @@ #include <linux/sound.h> #include <linux/soundcard.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <init.h> #include <os.h> diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 3df3bd544..006d3869a 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -24,7 +24,7 @@ #include <linux/fs.h> #include <linux/mount.h> #include <linux/file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/switch_to.h> #include <init.h> diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c index 62145c276..3645fcb2a 100644 --- a/arch/um/drivers/mmapper_kern.c +++ b/arch/um/drivers/mmapper_kern.c @@ -17,7 +17,7 @@ #include <linux/module.h> #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mem_user.h> /* These are set in mmapper_init, which is called at boot time */ diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c index 9e3a72205..d5bda9ba0 100644 --- a/arch/um/drivers/random.c +++ b/arch/um/drivers/random.c @@ -12,7 +12,7 @@ #include <linux/interrupt.h> #include <linux/miscdevice.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <irq_kern.h> #include <os.h> diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h index 2c8eeb2df..686d97f57 100644 --- a/arch/um/include/asm/thread_info.h +++ b/arch/um/include/asm/thread_info.h @@ -10,7 +10,7 @@ #include <asm/types.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct thread_info { struct task_struct *task; /* main task structure */ diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index 0d7103c9e..770ec07b6 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c @@ -11,7 +11,7 @@ #include <linux/slab.h> #include <asm/current.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <as-layout.h> #include <mem_user.h> #include <skas.h> diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c index 41ebbfebb..546302e3b 100644 --- a/arch/um/kernel/exitcode.c +++ b/arch/um/kernel/exitcode.c @@ -10,7 +10,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * If read and write race, the read will still atomically read a valid diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index bbcef522b..baec5b285 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -22,7 +22,7 @@ #include <asm/current.h> #include <asm/pgtable.h> #include <asm/mmu_context.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <as-layout.h> #include <kern_util.h> #include <os.h> diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c index 6536145cc..8f024ae09 100644 --- a/arch/um/kernel/ptrace.c +++ b/arch/um/kernel/ptrace.c @@ -7,7 +7,7 @@ #include <linux/ptrace.h> #include <linux/sched.h> #include <linux/tracehook.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <skas_ptrace.h> diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c index c1d0ae069..6258676be 100644 --- a/arch/um/kernel/syscall.c +++ b/arch/um/kernel/syscall.c @@ -11,7 +11,7 @@ #include <linux/syscalls.h> #include <asm/current.h> #include <asm/mman.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> long old_mmap(unsigned long addr, unsigned long len, diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index 52ff81cce..bb8a1d467 100644 --- a/arch/x86/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c @@ -26,7 +26,7 @@ #include <linux/init.h> #include <linux/jiffies.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/cacheflush.h> #include <asm/user32.h> diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index 10adb41f1..1a73285e4 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c @@ -20,7 +20,7 @@ #include <linux/compat.h> #include <linux/binfmts.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/i387.h> #include <asm/fpu-internal.h> #include <asm/ptrace.h> diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c index 8e0ceecdc..25ad470d7 100644 --- a/arch/x86/ia32/sys_ia32.c +++ b/arch/x86/ia32/sys_ia32.c @@ -42,7 +42,7 @@ #include <linux/slab.h> #include <asm/mman.h> #include <asm/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include <asm/vgtod.h> #include <asm/sys_ia32.h> 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> diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 3ab034302..24824ef38 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -234,7 +234,7 @@ #include <linux/i8253.h> #include <linux/cpuidle.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/desc.h> #include <asm/olpc.h> #include <asm/paravirt.h> diff --git a/arch/x86/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c index 11891ca7b..538fedea9 100644 --- a/arch/x86/kernel/crash_dump_32.c +++ b/arch/x86/kernel/crash_dump_32.c @@ -10,7 +10,7 @@ #include <linux/highmem.h> #include <linux/crash_dump.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static void *kdump_buf_page; diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c index 155a13f33..48df9e8ce 100644 --- a/arch/x86/kernel/doublefault_32.c +++ b/arch/x86/kernel/doublefault_32.c @@ -4,7 +4,7 @@ #include <linux/init_task.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/desc.h> diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index e6f08c685..77a083004 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c @@ -13,7 +13,7 @@ #include <asm/sigcontext.h> #include <asm/processor.h> #include <asm/math_emu.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ptrace.h> #include <asm/i387.h> #include <asm/fpu-internal.h> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 766aa3bf1..0cac4198e 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -53,7 +53,7 @@ #include <asm/cacheflush.h> #include <asm/desc.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/alternative.h> #include <asm/insn.h> #include <asm/debugreg.h> diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index 76dc6f095..935a7f46c 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -32,7 +32,7 @@ #include <asm/cacheflush.h> #include <asm/desc.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/alternative.h> #include <asm/insn.h> #include <asm/debugreg.h> diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 3179fc1bf..ee01c5515 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -23,7 +23,7 @@ #include <asm/apic.h> #include <asm/syscalls.h> #include <asm/idle.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/i387.h> #include <asm/fpu-internal.h> #include <asm/debugreg.h> diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 6d4c817c6..2087e6f19 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -25,7 +25,7 @@ #include <linux/export.h> #include <linux/context_tracking.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/i387.h> diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c index 3f92ce07e..3c0862995 100644 --- a/arch/x86/kernel/test_nx.c +++ b/arch/x86/kernel/test_nx.c @@ -13,7 +13,7 @@ #include <linux/sort.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/asm.h> extern int rodata_test_data; diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c index 7fc5e843f..c39e856d4 100644 --- a/arch/x86/kernel/tls.c +++ b/arch/x86/kernel/tls.c @@ -5,7 +5,7 @@ #include <linux/regset.h> #include <linux/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/desc.h> #include <asm/ldt.h> #include <asm/processor.h> diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c index e8edcf52e..8dd4d9205 100644 --- a/arch/x86/kernel/vm86_32.c +++ b/arch/x86/kernel/vm86_32.c @@ -45,7 +45,7 @@ #include <linux/audit.h> #include <linux/stddef.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/tlbflush.h> #include <asm/irq.h> diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c index b014d9414..3fdbf9555 100644 --- a/arch/x86/kernel/x8664_ksyms_64.c +++ b/arch/x86/kernel/x8664_ksyms_64.c @@ -8,7 +8,7 @@ #include <asm/processor.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/desc.h> #include <asm/ftrace.h> diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c index 3eb18acd0..7f5598b54 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c @@ -11,7 +11,7 @@ #include <linux/module.h> #include <linux/backing-dev.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmx.h> #include <asm/asm.h> diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c index 906fea315..c827e3337 100644 --- a/arch/x86/lib/usercopy_64.c +++ b/arch/x86/lib/usercopy_64.c @@ -6,7 +6,7 @@ * Copyright 2002 Andi Kleen <ak@suse.de> */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Zero Userspace diff --git a/arch/x86/math-emu/errors.c b/arch/x86/math-emu/errors.c index 59d353d2c..fb366a63c 100644 --- a/arch/x86/math-emu/errors.c +++ b/arch/x86/math-emu/errors.c @@ -19,7 +19,7 @@ #include <linux/signal.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "fpu_emu.h" #include "fpu_system.h" diff --git a/arch/x86/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c index 9b8681241..dc70393d6 100644 --- a/arch/x86/math-emu/fpu_entry.c +++ b/arch/x86/math-emu/fpu_entry.c @@ -27,7 +27,7 @@ #include <linux/signal.h> #include <linux/regset.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/traps.h> #include <asm/desc.h> #include <asm/user.h> diff --git a/arch/x86/math-emu/get_address.c b/arch/x86/math-emu/get_address.c index 6ef5e9938..603f377f5 100644 --- a/arch/x86/math-emu/get_address.c +++ b/arch/x86/math-emu/get_address.c @@ -19,7 +19,7 @@ #include <linux/stddef.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/desc.h> #include "fpu_system.h" diff --git a/arch/x86/math-emu/load_store.c b/arch/x86/math-emu/load_store.c index 2931ff355..c48235987 100644 --- a/arch/x86/math-emu/load_store.c +++ b/arch/x86/math-emu/load_store.c @@ -18,7 +18,7 @@ | other processes using the emulator while swapping is in progress. | +---------------------------------------------------------------------------*/ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "fpu_system.h" #include "exception.h" diff --git a/arch/x86/math-emu/reg_ld_str.c b/arch/x86/math-emu/reg_ld_str.c index d597fe742..2c98965a6 100644 --- a/arch/x86/math-emu/reg_ld_str.c +++ b/arch/x86/math-emu/reg_ld_str.c @@ -19,7 +19,7 @@ #include "fpu_emu.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "fpu_system.h" #include "exception.h" diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 903ec1e9c..02a77f9eb 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -1,7 +1,7 @@ #include <linux/module.h> #include <linux/spinlock.h> #include <linux/sort.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static inline unsigned long ex_insn_addr(const struct exception_table_entry *x) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 6a70f0ee4..89fa0899d 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -35,7 +35,7 @@ #include <asm/asm.h> #include <asm/bios_ebda.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/dma.h> #include <asm/fixmap.h> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index b04e50262..ce888d741 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -36,7 +36,7 @@ #include <asm/processor.h> #include <asm/bios_ebda.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> #include <asm/dma.h> diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 67cf093d1..3990eda62 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -20,7 +20,7 @@ #include <asm/tlbflush.h> #include <asm/sections.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> #include <asm/proto.h> #include <asm/pat.h> diff --git a/arch/x86/um/ptrace_32.c b/arch/x86/um/ptrace_32.c index ce3dd4f36..fd2feea3d 100644 --- a/arch/x86/um/ptrace_32.c +++ b/arch/x86/um/ptrace_32.c @@ -5,7 +5,7 @@ #include <linux/mm.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <skas.h> extern int arch_switch_tls(struct task_struct *to); diff --git a/arch/x86/um/ptrace_64.c b/arch/x86/um/ptrace_64.c index 3b52bf0b4..9f28dc6af 100644 --- a/arch/x86/um/ptrace_64.c +++ b/arch/x86/um/ptrace_64.c @@ -10,7 +10,7 @@ #include <linux/errno.h> #define __FRAME_OFFSETS #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * determines which flags the user has access to. diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c index 5e04a1c89..61e0a4715 100644 --- a/arch/x86/um/signal.c +++ b/arch/x86/um/signal.c @@ -9,7 +9,7 @@ #include <linux/ptrace.h> #include <linux/kernel.h> #include <asm/unistd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ucontext.h> #include <frame_kern.h> #include <skas.h> diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index 80ffa5b99..2912fc837 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c @@ -6,7 +6,7 @@ #include <linux/percpu.h> #include <linux/sched.h> #include <linux/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <os.h> #include <skas.h> #include <sysdep/tls.h> diff --git a/arch/xtensa/include/asm/checksum.h b/arch/xtensa/include/asm/checksum.h index 0593de689..8ea285f1d 100644 --- a/arch/xtensa/include/asm/checksum.h +++ b/arch/xtensa/include/asm/checksum.h @@ -12,7 +12,7 @@ #define _XTENSA_CHECKSUM_H #include <linux/in6.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <variant/core.h> /* diff --git a/arch/xtensa/include/asm/segment.h b/arch/xtensa/include/asm/segment.h index a2eb547a1..98964ad15 100644 --- a/arch/xtensa/include/asm/segment.h +++ b/arch/xtensa/include/asm/segment.h @@ -11,6 +11,6 @@ #ifndef _XTENSA_SEGMENT_H #define _XTENSA_SEGMENT_H -#include <asm/uaccess.h> +#include <linux/uaccess.h> #endif /* _XTENSA_SEGEMENT_H */ diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c index 1915c7c88..4f8cfc1e3 100644 --- a/arch/xtensa/kernel/asm-offsets.c +++ b/arch/xtensa/kernel/asm-offsets.c @@ -23,7 +23,7 @@ #include <linux/kbuild.h> #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int main(void) { diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S index 647657484..8a345d3ce 100644 --- a/arch/xtensa/kernel/coprocessor.S +++ b/arch/xtensa/kernel/coprocessor.S @@ -17,7 +17,7 @@ #include <asm/processor.h> #include <asm/coprocessor.h> #include <asm/thread_info.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/ptrace.h> #include <asm/current.h> diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S index b268d3cc0..1c7ee56d9 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S @@ -18,7 +18,7 @@ #include <asm/processor.h> #include <asm/coprocessor.h> #include <asm/thread_info.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/ptrace.h> #include <asm/current.h> diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c index 6f4f9749c..5376cb11f 100644 --- a/arch/xtensa/kernel/irq.c +++ b/arch/xtensa/kernel/irq.c @@ -21,7 +21,7 @@ #include <linux/irqdomain.h> #include <linux/of.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/platform.h> static unsigned int cached_irq_mask; diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index 1c85323f0..772cc7212 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c @@ -34,7 +34,7 @@ #include <linux/rcupdate.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/platform.h> diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c index 562fac664..f5c726c63 100644 --- a/arch/xtensa/kernel/ptrace.c +++ b/arch/xtensa/kernel/ptrace.c @@ -24,7 +24,7 @@ #include <asm/pgtable.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ptrace.h> #include <asm/elf.h> #include <asm/coprocessor.h> diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c index 98b67d5f1..25709d617 100644 --- a/arch/xtensa/kernel/signal.c +++ b/arch/xtensa/kernel/signal.c @@ -22,7 +22,7 @@ #include <linux/tracehook.h> #include <asm/ucontext.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #include <asm/coprocessor.h> #include <asm/unistd.h> diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c index 1ff0b92ee..fb7b861fd 100644 --- a/arch/xtensa/kernel/syscall.c +++ b/arch/xtensa/kernel/syscall.c @@ -15,7 +15,7 @@ * Kevin Chea * */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/syscall.h> #include <asm/unistd.h> #include <linux/linkage.h> diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index 3e8a05c87..9d4bde990 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c @@ -35,7 +35,7 @@ #include <asm/stacktrace.h> #include <asm/ptrace.h> #include <asm/timex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/traps.h> diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c index 42c53c87c..412dc892b 100644 --- a/arch/xtensa/kernel/xtensa_ksyms.c +++ b/arch/xtensa/kernel/xtensa_ksyms.c @@ -19,7 +19,7 @@ #include <asm/irq.h> #include <linux/in6.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/checksum.h> #include <asm/dma.h> #include <asm/io.h> diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c index 38278337d..6ab04364e 100644 --- a/arch/xtensa/mm/fault.c +++ b/arch/xtensa/mm/fault.c @@ -18,7 +18,7 @@ #include <asm/mmu_context.h> #include <asm/cacheflush.h> #include <asm/hardirq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgalloc.h> unsigned long asid_cache = ASID_USER_FIRST; diff --git a/arch/xtensa/oprofile/backtrace.c b/arch/xtensa/oprofile/backtrace.c index 5f03a593d..65376a469 100644 --- a/arch/xtensa/oprofile/backtrace.c +++ b/arch/xtensa/oprofile/backtrace.c @@ -10,7 +10,7 @@ #include <linux/sched.h> #include <linux/mm.h> #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/traps.h> /* Address of common_exception_return, used to check the diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 92d785fef..ec599df3a 100644 --- a/arch/xtensa/platforms/iss/console.c +++ b/arch/xtensa/platforms/iss/console.c @@ -20,7 +20,7 @@ #include <linux/seq_file.h> #include <linux/serial.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <platform/simcall.h> diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c index c0edb3542..b880c7e48 100644 --- a/arch/xtensa/platforms/iss/simdisk.c +++ b/arch/xtensa/platforms/iss/simdisk.c @@ -17,7 +17,7 @@ #include <linux/blkdev.h> #include <linux/bio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <platform/simcall.h> #define SIMDISK_MAJOR 240 diff --git a/block/ioctl.c b/block/ioctl.c index bb601f18d..7d4d47f82 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -7,7 +7,7 @@ #include <linux/backing-dev.h> #include <linux/fs.h> #include <linux/blktrace_api.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user *arg) { diff --git a/block/partitions/ibm.c b/block/partitions/ibm.c index 47a61474e..14b081af8 100644 --- a/block/partitions/ibm.c +++ b/block/partitions/ibm.c @@ -10,7 +10,7 @@ #include <linux/slab.h> #include <asm/dasd.h> #include <asm/ebcdic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/vtoc.h> #include "check.h" diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 3a2530221..88ce34d5b 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -28,7 +28,7 @@ #include <linux/slab.h> #include <linux/times.h> #include <linux/uio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_ioctl.h> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 3add5a26a..cb8a5481d 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -40,7 +40,7 @@ #ifdef CONFIG_ACPI_PROCFS_POWER #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #endif #include <acpi/acpi_bus.h> diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 8d1c0105e..773884826 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -27,7 +27,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/thermal.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 276ea4727..c9afabfd9 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -47,7 +47,7 @@ #include <linux/semaphore.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <acpi/acpi.h> #include <acpi/acpi_bus.h> diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 04a13784d..143256a80 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c @@ -3,7 +3,7 @@ #include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 3efb90bb0..280ecb27a 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -50,7 +50,7 @@ #include <asm/io.h> #include <asm/cpu.h> #include <asm/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> #include <asm/smp.h> #include <asm/acpi.h> diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index e8e652710..566185413 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c @@ -31,7 +31,7 @@ #include <linux/init.h> #include <linux/cpufreq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <acpi/acpi_bus.h> #include <acpi/processor.h> diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index 5e47d7bf4..fedb04203 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c @@ -34,7 +34,7 @@ #include <linux/cpufreq.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 056cf93fa..bf4e440c4 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -33,7 +33,7 @@ #ifdef CONFIG_ACPI_PROCFS_POWER #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #endif #include <linux/acpi.h> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index a33821ca3..5d4190013 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -41,7 +41,7 @@ #include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/thermal.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index e3ecaf4d6..b5f8b09fc 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -37,7 +37,7 @@ #include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dmi.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c index f9b983ae6..1fd25e872 100644 --- a/drivers/atm/adummy.c +++ b/drivers/atm/adummy.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <asm/io.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atmdev.h> #include <linux/atm.h> diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c index 0e3f8f9dc..ef915efe2 100644 --- a/drivers/atm/atmtcp.c +++ b/drivers/atm/atmtcp.c @@ -10,7 +10,7 @@ #include <linux/bitops.h> #include <linux/init.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index b1955ba40..20d65e9df 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c @@ -21,7 +21,7 @@ #include <linux/slab.h> #include <asm/io.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/string.h> #include <asm/byteorder.h> diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index b41c9481b..7e8f0d827 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c @@ -52,7 +52,7 @@ #include <asm/string.h> #include <asm/io.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/wait.h> #include "firestream.h" diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 204814e88..ab8c4959d 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -43,7 +43,7 @@ #include <asm/irq.h> #include <asm/dma.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #ifdef CONFIG_SBUS diff --git a/drivers/atm/he.c b/drivers/atm/he.c index 507362a76..8b1534734 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -71,7 +71,7 @@ #include <linux/slab.h> #include <asm/io.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atmdev.h> #include <linux/atm.h> diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index 1dc051933..ca8ca60f7 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c @@ -45,7 +45,7 @@ #include <asm/io.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/string.h> #include <asm/byteorder.h> diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c index 45d506363..ffec8f26a 100644 --- a/drivers/atm/idt77105.c +++ b/drivers/atm/idt77105.c @@ -17,7 +17,7 @@ #include <linux/spinlock.h> #include <linux/slab.h> #include <asm/param.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "idt77105.h" diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 1bdf104e9..7a5494e36 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -45,7 +45,7 @@ #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include <asm/byteorder.h> diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 4217f29a8..87bc11f12 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -58,7 +58,7 @@ #include <linux/slab.h> #include <asm/io.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/string.h> #include <asm/byteorder.h> #include <linux/vmalloc.h> diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 6587dc295..5420c07b2 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -50,7 +50,7 @@ #include <linux/slab.h> #include <linux/idr.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include "nicstar.h" #ifdef CONFIG_ATM_NICSTAR_USE_SUNI diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c index 021593455..b0363149b 100644 --- a/drivers/atm/suni.c +++ b/drivers/atm/suni.c @@ -23,7 +23,7 @@ #include <linux/atm_suni.h> #include <linux/slab.h> #include <asm/param.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include "suni.h" diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c index 5120a96b3..4fa13a807 100644 --- a/drivers/atm/uPD98402.c +++ b/drivers/atm/uPD98402.c @@ -10,7 +10,7 @@ #include <linux/sonet.h> #include <linux/init.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include "uPD98402.h" diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index 969c3c290..e6092cd1b 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c @@ -27,7 +27,7 @@ #include <asm/string.h> #include <asm/io.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "uPD98401.h" #include "uPD98402.h" diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 4ca365fc7..19f8641dc 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -875,7 +875,7 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, #include <linux/fs.h> #include <linux/miscdevice.h> #include <linux/dma-mapping.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sh_svp.h> #define SVP_STATE_NULL 0x00 diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 86abbff91..f894ebf24 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -24,7 +24,7 @@ #include <linux/slab.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static DEFINE_MUTEX(mem_sysfs_mutex); diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index eb3950113..d99b62cdc 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -48,7 +48,7 @@ #include <linux/random.h> #include <linux/scatterlist.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "DAC960.h" #define DAC960_GAM_MINOR 252 diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 4ff85b878..9e90304cc 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -70,7 +70,7 @@ #include <linux/platform_device.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/amigahw.h> #include <asm/amigaints.h> #include <asm/irq.h> diff --git a/drivers/block/brd.c b/drivers/block/brd.c index d91f1a56e..c15efa3ee 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -20,7 +20,7 @@ #include <linux/fs.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define SECTOR_SHIFT 9 #define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 90a4e6b94..af368fc25 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -43,7 +43,7 @@ #include <linux/mutex.h> #include <linux/bitmap.h> #include <linux/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dma-mapping.h> #include <linux/blkdev.h> diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 2b9440384..c2e4f9b08 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c @@ -40,7 +40,7 @@ #include <linux/blkdev.h> #include <linux/genhd.h> #include <linux/scatterlist.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c index 8b6bb764b..7205c83c8 100644 --- a/drivers/block/cryptoloop.c +++ b/drivers/block/cryptoloop.c @@ -27,7 +27,7 @@ #include <linux/blkdev.h> #include <linux/loop.h> #include <linux/scatterlist.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("loop blockdevice transferfunction adaptor / CryptoAPI"); diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 776fc08af..8e47ed3db 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -28,7 +28,7 @@ #include <linux/module.h> #include <linux/drbd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/types.h> #include <net/sock.h> #include <linux/ctype.h> diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c index bf31d41db..9d188402b 100644 --- a/drivers/block/drbd/drbd_proc.c +++ b/drivers/block/drbd/drbd_proc.c @@ -25,7 +25,7 @@ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fs.h> #include <linux/file.h> #include <linux/proc_fs.h> diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 4222affff..a1cc7e76d 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -25,7 +25,7 @@ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/sock.h> #include <linux/drbd.h> diff --git a/drivers/block/hd.c b/drivers/block/hd.c index bf397bf10..6601a0ccd 100644 --- a/drivers/block/hd.c +++ b/drivers/block/hd.c @@ -45,7 +45,7 @@ #define REALLY_SLOW_IO #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef __arm__ #undef HD_IRQ diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 333458ca1..4240f9334 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -77,7 +77,7 @@ #include <linux/miscdevice.h> #include <linux/falloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static DEFINE_IDR(loop_index_idr); static DEFINE_MUTEX(loop_index_mutex); diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index be7328661..d22e513e7 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -33,7 +33,7 @@ #include <linux/net.h> #include <linux/kthread.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/types.h> #include <linux/nbd.h> diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index e76bdc074..2be4cb27f 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c @@ -139,7 +139,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY}; #include <linux/spinlock.h> #include <linux/blkdev.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static DEFINE_MUTEX(pcd_mutex); static DEFINE_SPINLOCK(pcd_lock); diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index 897b6b9e5..b7b25f92b 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c @@ -155,7 +155,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV}; #include <linux/blkpg.h> #include <linux/kernel.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/workqueue.h> static DEFINE_MUTEX(pd_mutex); diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c index f5c86d523..92fe0a9a0 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c @@ -155,7 +155,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_LUN, D_DLY}; #include <linux/blkdev.h> #include <linux/blkpg.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static DEFINE_MUTEX(pf_mutex); static DEFINE_SPINLOCK(pf_spin_lock); diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index 4a27b1de5..b9e00ad0e 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c @@ -166,7 +166,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY}; #include <linux/mutex.h> #include <linux/jiffies.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> module_param(verbose, bool, 0644); module_param(major, int, 0); diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index ada45058e..26bc89ca5 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c @@ -150,7 +150,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3}; #include <linux/sched.h> /* current, TASK_*, schedule_timeout() */ #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> module_param(verbose, int, 0); module_param(major, int, 0); diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index caddb5dba..8c9efcbcd 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -65,7 +65,7 @@ #include <linux/debugfs.h> #include <linux/device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DRIVER_NAME "pktcdvd" diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 20e061c3e..cd649c147 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -33,7 +33,7 @@ #include <asm/io.h> #include <asm/dbdma.h> #include <asm/prom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mediabay.h> #include <asm/machdep.h> #include <asm/pmac_feature.h> diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 3fb6ab4c8..343c280b1 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -29,7 +29,7 @@ #include <linux/completion.h> #include <linux/scatterlist.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #if 0 #define CARM_DEBUG diff --git a/drivers/block/umem.c b/drivers/block/umem.c index ad70868f8..cd8cf7fd4 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c @@ -54,7 +54,7 @@ #include "umem.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #define MM_MAXCARDS 4 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 1ca0772c7..99d4662d5 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -282,7 +282,7 @@ #include <linux/blkdev.h> #include <linux/times.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* used to tell the module to turn on full debugging messages */ static bool debug; diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c index a48e05b31..2053f70ef 100644 --- a/drivers/char/agp/compat_ioctl.c +++ b/drivers/char/agp/compat_ioctl.c @@ -31,7 +31,7 @@ #include <linux/fs.h> #include <linux/agpgart.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "agp.h" #include "compat_ioctl.h" diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c index 2e0443387..5178bec23 100644 --- a/drivers/char/agp/frontend.c +++ b/drivers/char/agp/frontend.c @@ -39,7 +39,7 @@ #include <linux/mm.h> #include <linux/fs.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include "agp.h" diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c index 14790304b..e5c62dcf2 100644 --- a/drivers/char/applicom.c +++ b/drivers/char/applicom.c @@ -34,7 +34,7 @@ #include <linux/fs.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "applicom.h" diff --git a/drivers/char/bfin-otp.c b/drivers/char/bfin-otp.c index 44660f1c4..132d201d3 100644 --- a/drivers/char/bfin-otp.c +++ b/drivers/char/bfin-otp.c @@ -20,7 +20,7 @@ #include <asm/blackfin.h> #include <asm/bfrom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args) #define stampit() stamp("here i am") diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c index 0fae5296e..eb53cbadb 100644 --- a/drivers/char/ds1620.c +++ b/drivers/char/ds1620.c @@ -13,7 +13,7 @@ #include <mach/hardware.h> #include <asm/mach-types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/therm.h> #ifdef CONFIG_PROC_FS diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c index 65a8d96c0..58471394b 100644 --- a/drivers/char/dtlk.c +++ b/drivers/char/dtlk.c @@ -59,7 +59,7 @@ #include <linux/sched.h> #include <linux/mutex.h> #include <asm/io.h> /* for inb_p, outb_p, inb, outb, etc. */ -#include <asm/uaccess.h> /* for get_user, etc. */ +#include <linux/uaccess.h> /* for get_user, etc. */ #include <linux/wait.h> /* for wait_queue */ #include <linux/init.h> /* for __init, module_{init,exit} */ #include <linux/poll.h> /* for POLLIN, etc. */ diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c index 6c4f4b5a9..098479b33 100644 --- a/drivers/char/generic_nvram.c +++ b/drivers/char/generic_nvram.c @@ -20,7 +20,7 @@ #include <linux/fcntl.h> #include <linux/init.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/nvram.h> #ifdef CONFIG_PPC_PMAC #include <asm/machdep.h> diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c index 4f943759d..e5f9c184a 100644 --- a/drivers/char/genrtc.c +++ b/drivers/char/genrtc.c @@ -56,7 +56,7 @@ #include <linux/mutex.h> #include <linux/workqueue.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/rtc.h> /* diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c index f953c96ef..cc96b5629 100644 --- a/drivers/char/hangcheck-timer.c +++ b/drivers/char/hangcheck-timer.c @@ -46,7 +46,7 @@ #include <linux/reboot.h> #include <linux/init.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sysrq.h> #include <linux/timer.h> #include <linux/time.h> diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c index a0f772485..803f71aef 100644 --- a/drivers/char/hw_random/core.c +++ b/drivers/char/hw_random/core.c @@ -41,7 +41,7 @@ #include <linux/miscdevice.h> #include <linux/delay.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define RNG_MODULE_NAME "hw_random" diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index e6939e13e..4af30db06 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c @@ -29,7 +29,7 @@ #include <linux/mutex.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/i8k.h> diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 37b8be7cb..021dd6509 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -43,7 +43,7 @@ #include <linux/kdebug.h> #include <linux/rwsem.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/notifier.h> #include <linux/nmi.h> #include <linux/reboot.h> diff --git a/drivers/char/lp.c b/drivers/char/lp.c index 6b619105d..01e48b979 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c @@ -134,7 +134,7 @@ #include <linux/lp.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* if you have more than 8 printers, remember to increase LP_NO */ #define LP_NO 8 diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c index e5d3e3f7a..07e865e6b 100644 --- a/drivers/char/mbcs.c +++ b/drivers/char/mbcs.c @@ -27,7 +27,7 @@ #include <linux/mutex.h> #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/sn/addrs.h> #include <asm/sn/intr.h> diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 1a62849e7..8da24e019 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -30,7 +30,7 @@ #include <linux/io.h> #include <linux/aio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_IA64 # include <linux/efi.h> diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index 3d6c0671e..f786b18ac 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c @@ -35,7 +35,7 @@ #include <linux/mutex.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sn/addrs.h> #include <asm/sn/intr.h> #include <asm/sn/shub_mmr.h> diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c index 881c9e595..07472b327 100644 --- a/drivers/char/mwave/3780i.c +++ b/drivers/char/mwave/3780i.c @@ -55,7 +55,7 @@ #include <linux/sched.h> /* cond_resched() */ #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include "smapi.h" #include "mwavedd.h" diff --git a/drivers/char/mwave/mwavedd.h b/drivers/char/mwave/mwavedd.h index 7e0d530e2..ecce012c1 100644 --- a/drivers/char/mwave/mwavedd.h +++ b/drivers/char/mwave/mwavedd.h @@ -53,7 +53,7 @@ #include "smapi.h" #include "mwavepub.h" #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/wait.h> extern int mwave_debug; diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c index b07b119ae..2a91bf048 100644 --- a/drivers/char/nsc_gpio.c +++ b/drivers/char/nsc_gpio.c @@ -14,7 +14,7 @@ #include <linux/init.h> #include <linux/nsc_gpio.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #define NAME "nsc_gpio" diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c index cfdfe493c..b861d4f10 100644 --- a/drivers/char/nwbutton.c +++ b/drivers/char/nwbutton.c @@ -16,7 +16,7 @@ #include <linux/errno.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/mach-types.h> diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c index e371480d3..9b3a4b61e 100644 --- a/drivers/char/nwflash.c +++ b/drivers/char/nwflash.c @@ -31,7 +31,7 @@ #include <asm/hardware/dec21285.h> #include <asm/io.h> #include <asm/mach-types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /*****************************************************************************/ #include <asm/nwflash.h> diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c index 3f79a9fb6..5f4be88c0 100644 --- a/drivers/char/pc8736x_gpio.c +++ b/drivers/char/pc8736x_gpio.c @@ -20,7 +20,7 @@ #include <linux/mutex.h> #include <linux/nsc_gpio.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DEVNAME "pc8736x_gpio" diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index 8dd48a2be..baa8bd8c4 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c @@ -26,7 +26,7 @@ #include <linux/poll.h> #include <linux/mutex.h> #include <linux/wait.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <pcmcia/cistpl.h> diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 5c5cc00eb..10d958d71 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -84,7 +84,7 @@ #define PUT_USER(error,value,addr) error = put_user(value,addr) #define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0 -#include <asm/uaccess.h> +#include <linux/uaccess.h> static MGSL_PARAMS default_params = { MGSL_MODE_HDLC, /* unsigned long mode */ diff --git a/drivers/char/random.c b/drivers/char/random.c index 9064bf0d0..fd09deec2 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -266,7 +266,7 @@ #include <linux/completion.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/irq_regs.h> #include <asm/io.h> diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 6e8d65e9b..005e9bd6d 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c @@ -23,7 +23,7 @@ #include <linux/compat.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct raw_device_data { struct block_device *binding; diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c index 0bc135b9b..903761bc4 100644 --- a/drivers/char/scx200_gpio.c +++ b/drivers/char/scx200_gpio.c @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/types.h> diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index bf2349dbb..d36e4a8f8 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -52,7 +52,7 @@ #include <linux/platform_device.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/sonypi.h> diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index e95e0ab0b..21f9a2cb9 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c @@ -44,7 +44,7 @@ #include <linux/miscdevice.h> #include <linux/platform_device.h> #include <asm/io.h> /* inb/outb */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> MODULE_AUTHOR("Sebastien Bouchard <sebastien.bouchard@ca.kontron.com>"); MODULE_LICENSE("GPL"); diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c index 014c9d90d..8e1e61e84 100644 --- a/drivers/char/toshiba.c +++ b/drivers/char/toshiba.c @@ -63,7 +63,7 @@ #include <linux/miscdevice.h> #include <linux/ioport.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/init.h> #include <linux/stat.h> #include <linux/proc_fs.h> diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index 5224da520..cb66569c1 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c @@ -88,7 +88,7 @@ #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_OF /* For open firmware. */ diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c index c0075dbaa..82279e482 100644 --- a/drivers/cpufreq/ia64-acpi-cpufreq.c +++ b/drivers/cpufreq/ia64-acpi-cpufreq.c @@ -16,7 +16,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pal.h> #include <linux/acpi.h> diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c index 9b784051e..1ad6ac762 100644 --- a/drivers/cpuidle/governors/ladder.c +++ b/drivers/cpuidle/governors/ladder.c @@ -19,7 +19,7 @@ #include <linux/jiffies.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define PROMOTION_COUNT 4 #define DEMOTION_COUNT 1 diff --git a/drivers/cpuidle/mtk_cpuidle_internal.c b/drivers/cpuidle/mtk_cpuidle_internal.c index 90a70233e..d2363e93c 100644 --- a/drivers/cpuidle/mtk_cpuidle_internal.c +++ b/drivers/cpuidle/mtk_cpuidle_internal.c @@ -1,4 +1,4 @@ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/cpu.h> #include <linux/debugfs.h> #include <linux/seq_file.h> diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index 55dd88d82..830184529 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c @@ -31,7 +31,7 @@ #include <linux/init.h> #include <linux/dio.h> #include <linux/slab.h> /* kmalloc() */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /* readb() */ struct dio_bus dio_bus = { diff --git a/drivers/dma/iovlock.c b/drivers/dma/iovlock.c index bb48a57c2..d320a4e13 100644 --- a/drivers/dma/iovlock.c +++ b/drivers/dma/iovlock.c @@ -30,7 +30,7 @@ #include <linux/slab.h> #include <net/tcp.h> /* for memcpy_toiovec */ #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int num_pages_spanned(struct iovec *iov) { diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 211021dfe..2b7b141b7 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -25,7 +25,7 @@ #include <linux/list.h> #include <linux/ctype.h> #include <linux/workqueue.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include "edac_core.h" diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 9e15fc8df..4298eb83a 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -28,7 +28,7 @@ #include <linux/ctype.h> #include <linux/edac.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/edac.h> #include "edac_core.h" diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index dd370f92a..84b1ed82a 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c @@ -21,7 +21,7 @@ #include <linux/list.h> #include <linux/ctype.h> #include <linux/workqueue.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include "edac_core.h" diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 5de00c496..ae5eb983c 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -42,7 +42,7 @@ #include <linux/rwsem.h> #include <linux/pm_runtime.h> #include <linux/acpi.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "i2c-core.h" diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c index 696b6c1ec..0f3ec077d 100644 --- a/drivers/ide/hpt366.c +++ b/drivers/ide/hpt366.c @@ -130,7 +130,7 @@ #include <linux/ide.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #define DRV_NAME "hpt366" diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 121071f9d..2b77f1699 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -31,7 +31,7 @@ #include <asm/byteorder.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/div64.h> diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 177db6d5b..e13bd7fa0 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -51,7 +51,7 @@ #include <asm/byteorder.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> int ide_end_rq(ide_drive_t *drive, struct request *rq, int error, diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 376f2dc41..210a0887d 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -24,7 +24,7 @@ #include <asm/byteorder.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> void SELECT_MASK(ide_drive_t *drive, int mask) diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 068cef0a9..9b7b72578 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -36,7 +36,7 @@ #include <asm/byteorder.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /** diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 97c070077..863db44c7 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c @@ -16,7 +16,7 @@ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/proc_fs.h> #include <linux/stat.h> diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index 5befec118..ed039eb9a 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c @@ -46,7 +46,7 @@ #include <linux/mutex.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <rdma/ib.h> #include <rdma/ib_cm.h> diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 1acb99100..691907c03 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -48,7 +48,7 @@ #include <linux/semaphore.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <rdma/ib_mad.h> #include <rdma/ib_user_mad.h> diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 44c15cebd..9ff9d4772 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -37,7 +37,7 @@ #include <linux/fs.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "uverbs.h" diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index 37b720794..3394601f5 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c @@ -46,7 +46,7 @@ #include <linux/anon_inodes.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <rdma/ib.h> diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c index 45802e973..a28cc1954 100644 --- a/drivers/infiniband/hw/ipath/ipath_diag.c +++ b/drivers/infiniband/hw/ipath/ipath_diag.c @@ -46,7 +46,7 @@ #include <linux/vmalloc.h> #include <linux/fs.h> #include <linux/export.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ipath_kernel.h" #include "ipath_common.h" diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c index 7604ae54d..a06372acb 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c @@ -35,7 +35,7 @@ #include <linux/init.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ipoib.h" diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 2e84ef859..c8b46603d 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c @@ -62,7 +62,7 @@ #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_device.h> diff --git a/drivers/input/input-compat.c b/drivers/input/input-compat.c index 64ca7113f..4cc735b14 100644 --- a/drivers/input/input-compat.c +++ b/drivers/input/input-compat.c @@ -9,7 +9,7 @@ */ #include <linux/export.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "input-compat.h" #ifdef CONFIG_COMPAT diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c index 5d4402365..2c04a966b 100644 --- a/drivers/input/misc/atlas_btns.c +++ b/drivers/input/misc/atlas_btns.c @@ -28,7 +28,7 @@ #include <linux/init.h> #include <linux/input.h> #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI" diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c index b55d5af21..c327187d0 100644 --- a/drivers/input/mouse/amimouse.c +++ b/drivers/input/mouse/amimouse.c @@ -25,7 +25,7 @@ #include <asm/irq.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/amigahw.h> #include <asm/amigaints.h> diff --git a/drivers/input/mouse/atarimouse.c b/drivers/input/mouse/atarimouse.c index d1c43236b..96f2f5160 100644 --- a/drivers/input/mouse/atarimouse.c +++ b/drivers/input/mouse/atarimouse.c @@ -47,7 +47,7 @@ #include <asm/irq.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atarihw.h> #include <asm/atarikb.h> #include <asm/atariints.h> diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index ca843b6cf..d092016c4 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -15,7 +15,7 @@ #include <linux/input.h> #include <linux/libps2.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "psmouse.h" #include "trackpoint.h" diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index d7a7e54f6..4558b86a7 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c @@ -79,7 +79,7 @@ # define sdc_readb(p) gsc_readb(p) # define sdc_writeb(v,p) gsc_writeb((v),(p)) #elif defined(__mc68000__) -# include <asm/uaccess.h> +#include <linux/uaccess.h> # define sdc_readb(p) in_8(p) # define sdc_writeb(v,p) out_8((p),(v)) #else diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c index 436a3433f..a4e2e124d 100644 --- a/drivers/input/serio/q40kbd.c +++ b/drivers/input/serio/q40kbd.c @@ -39,7 +39,7 @@ #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/q40_master.h> #include <asm/irq.h> #include <asm/q40ints.h> diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c index e4ecf3b64..61769aa5b 100644 --- a/drivers/input/serio/serport.c +++ b/drivers/input/serio/serport.c @@ -13,7 +13,7 @@ * the Free Software Foundation. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/slab.h> diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index ee83c3904..6bb888102 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c @@ -76,7 +76,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/usb/input.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> /* diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c index 5a7be4c55..ccceda74c 100644 --- a/drivers/input/tablet/gtco.c +++ b/drivers/input/tablet/gtco.c @@ -57,7 +57,7 @@ Scott Hill shill@gtcocalcomp.com #include <linux/slab.h> #include <linux/input.h> #include <linux/usb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> #include <asm/byteorder.h> diff --git a/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c b/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c index 4cb3c24e0..f0e9958c5 100644 --- a/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c +++ b/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c @@ -40,7 +40,7 @@ #include <linux/completion.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include <asm/unaligned.h> #include <mach/eint.h> diff --git a/drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c b/drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c index dfd893d96..6cf316e87 100644 --- a/drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c +++ b/drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c @@ -32,7 +32,7 @@ #ifdef CONFIG_COMPAT #include <linux/compat.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> /*proc */ #include <asm/ioctl.h> diff --git a/drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c b/drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c index 80368d2f8..c4060c9f0 100644 --- a/drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c +++ b/drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c @@ -20,7 +20,7 @@ */ #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> #include "gt1x_generic.h" diff --git a/drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c b/drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c index 3ba359460..9f0f32201 100644 --- a/drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c +++ b/drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c @@ -26,7 +26,7 @@ #include <linux/delay.h> #include <linux/namei.h> #include <linux/mount.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "gt1x_generic.h" #if (GTP_HOTKNOT || GTP_HEADER_FW_UPDATE) diff --git a/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c b/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c index 55623fa57..12c5d760b 100644 --- a/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c +++ b/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c @@ -19,7 +19,7 @@ #include <linux/rtpm_prio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_GT813.h" diff --git a/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c b/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c index 86c34d00b..4ac583bde 100644 --- a/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c +++ b/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c @@ -21,7 +21,7 @@ #include <linux/rtpm_prio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_GT818B.h" #include <mach/mt_pm_ldo.h> @@ -173,7 +173,7 @@ static struct proc_dir_entry *gt818_config_proc = NULL; #ifdef VELOCITY_CUSTOM_GT818B #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifndef TPD_VELOCITY_CUSTOM_X #define TPD_VELOCITY_CUSTOM_X 10 diff --git a/drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c index 1a3e92fc4..5eed8009f 100644 --- a/drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c @@ -14,7 +14,7 @@ #include <linux/i2c.h> #include <linux/proc_fs.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define IC_TYPE_NAME "GT818" #define DATA_LENGTH_UINT 512 diff --git a/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c b/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c index 1ba26e3f6..730f8d829 100644 --- a/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c +++ b/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c @@ -19,7 +19,7 @@ #include <linux/rtpm_prio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> @@ -170,7 +170,7 @@ static struct proc_dir_entry *gt818_config_proc = NULL; #ifdef VELOCITY_CUSTOM_GT818B #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifndef TPD_VELOCITY_CUSTOM_X #define TPD_VELOCITY_CUSTOM_X 10 diff --git a/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c b/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c index 0060bd2bf..3aa78bceb 100644 --- a/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c +++ b/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c @@ -25,7 +25,7 @@ #include <linux/fs.h> #include <linux/string.h> #include <linux/completion.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_pm_ldo.h> #include <mach/mt_typedefs.h> diff --git a/drivers/input/touchscreen/mediatek/GT910/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT910/goodix_tool.c index 8a268a800..f2ed97973 100644 --- a/drivers/input/touchscreen/mediatek/GT910/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT910/goodix_tool.c @@ -30,7 +30,7 @@ #include <linux/time.h> #include <linux/delay.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c index 87f2098ed..3aa31033f 100644 --- a/drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c @@ -40,7 +40,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT911/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT911/goodix_tool.c index 55ff8656c..4d2e081d2 100644 --- a/drivers/input/touchscreen/mediatek/GT911/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT911/goodix_tool.c @@ -30,7 +30,7 @@ #include <linux/time.h> #include <linux/delay.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c index f4fd83f68..c3399d413 100644 --- a/drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c @@ -30,7 +30,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GUP_FW_INFO #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c index db9406bd1..af710d90b 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c @@ -30,7 +30,7 @@ #include <linux/time.h> #include <linux/delay.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c index cf49f909c..209189654 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c @@ -30,7 +30,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GUP_FW_INFO #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c index d1faccce4..dc803aedc 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c @@ -30,7 +30,7 @@ #include <linux/time.h> #include <linux/delay.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c index ea731d451..623226c4b 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c @@ -256,7 +256,7 @@ static struct proc_dir_entry *gt91xx_config_proc = NULL; #ifdef VELOCITY_CUSTOM #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifndef TPD_VELOCITY_CUSTOM_X #define TPD_VELOCITY_CUSTOM_X 10 diff --git a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c index 650b53f72..fcf511802 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c @@ -46,7 +46,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c index d04192ac7..944faaca8 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c @@ -32,7 +32,7 @@ #include "cust_gpio_usage.h" #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> /*proc*/ #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c index d7a79471a..61d352a4f 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c @@ -46,7 +46,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GUP_FW_INFO #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c index d04192ac7..944faaca8 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c @@ -32,7 +32,7 @@ #include "cust_gpio_usage.h" #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> /*proc*/ #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c index 3e5eda70d..47d986c60 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c @@ -46,7 +46,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GUP_FW_INFO #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c index c6f819a92..dd77dab9a 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c @@ -32,7 +32,7 @@ #include "cust_gpio_usage.h" #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> /*proc*/ #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c index babee2638..7fce07f93 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c @@ -46,7 +46,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GUP_FW_INFO #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c index d04192ac7..944faaca8 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c @@ -32,7 +32,7 @@ #include "cust_gpio_usage.h" #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> /*proc*/ #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c index 17dcad5bb..d84e14d66 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c @@ -46,7 +46,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GUP_FW_INFO #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c index 050e55d23..5aad7ee4a 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c @@ -32,7 +32,7 @@ #include "cust_gpio_usage.h" #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> /*proc*/ #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c index 4d005365b..dc6cd3e2a 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c @@ -46,7 +46,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GUP_FW_INFO #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c index d04192ac7..944faaca8 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c @@ -32,7 +32,7 @@ #include "cust_gpio_usage.h" #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> /*proc*/ #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c index 09a3ef4c6..a73402877 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c @@ -46,7 +46,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GUP_FW_INFO #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c index 20c2add33..c708b607c 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c @@ -6,7 +6,7 @@ #include <linux/kernel.h>
#include <linux/semaphore.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/init.h>
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c index 7e6808ceb..44534623f 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c @@ -196,7 +196,7 @@ static int tpd_def_calmat_local[8] = TPD_CALIBRATION_MATRIX; #ifdef VELOCITY_CUSTOM_FT5206
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
// for magnify velocity********************************************
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h index 44fbadc46..6cdcc7ddc 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h @@ -12,7 +12,7 @@ #include <linux/syscalls.h>
#include <asm/unistd.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fs.h>
#include <linux/string.h>
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h b/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h index 82f225470..2cbfae913 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h @@ -27,7 +27,7 @@ #include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c b/drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c index 9cee78f86..7f215491e 100644 --- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c +++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c @@ -31,7 +31,7 @@ #include <linux/time.h> #include <linux/delay.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c index 57a5d8ef9..2cc8b949b 100644 --- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c @@ -285,7 +285,7 @@ static const struct file_operations config_proc_ops = { #ifdef VELOCITY_CUSTOM #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifndef TPD_VELOCITY_CUSTOM_X #define TPD_VELOCITY_CUSTOM_X 10 diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c index 626a8d881..59591f82f 100644 --- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c +++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c @@ -50,7 +50,7 @@ #include <linux/namei.h> #include <linux/mount.h> #include "cust_gpio_usage.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd_custom_gt9xx.h" diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h b/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h index 63f3da5f2..36c9f750c 100644 --- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h +++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h @@ -62,7 +62,7 @@ #include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef MT6575
#include <mach/mt6575_pm_ldo.h>
#include <mach/mt6575_typedefs.h>
diff --git a/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c b/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c index da6b9a07f..46f77987a 100644 --- a/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c +++ b/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c @@ -27,7 +27,7 @@ #ifdef TPD_UPDATE_FIRMWARE #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/namei.h> #include <linux/vmalloc.h> diff --git a/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c b/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c index c08438e1f..daaa7e5f4 100644 --- a/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c +++ b/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c @@ -104,7 +104,7 @@ static int tpd_def_calmat_local[8] = TPD_CALIBRATION_MATRIX; #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct touch_info { int y[10]; diff --git a/drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h b/drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h index bf48b0e58..b490961a2 100644 --- a/drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h +++ b/drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h @@ -12,7 +12,7 @@ #include <linux/syscalls.h> #include <asm/unistd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fs.h> #include <linux/string.h> diff --git a/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c b/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c index c48b6dadf..d70ccb829 100644 --- a/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c +++ b/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c @@ -105,7 +105,7 @@ static int tpd_def_calmat_local[8] = TPD_CALIBRATION_MATRIX; #ifdef VELOCITY_CUSTOM_FT5206 #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> // for magnify velocity******************************************** diff --git a/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c b/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c index 008d9f689..deccc3376 100644 --- a/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c +++ b/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c @@ -19,7 +19,7 @@ #include <linux/rtpm_prio.h> #include <mach/eint.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include <linux/jiffies.h> diff --git a/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c b/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c index 39d1d680e..d29e6afe7 100644 --- a/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c +++ b/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c @@ -16,7 +16,7 @@ #include <linux/completion.h> #include <linux/init.h> #include <linux/dma-mapping.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> //#include <mach/mt_gpio.h> #include "tpd.h" diff --git a/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c b/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c index a97de60fc..4fc404b0b 100644 --- a/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c +++ b/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c @@ -20,7 +20,7 @@ #include <linux/rtpm_prio.h> #include <mach/eint.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include <linux/jiffies.h> diff --git a/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c b/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c index e16e826ce..673837bab 100644 --- a/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c +++ b/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c @@ -22,7 +22,7 @@ #include <linux/rtpm_prio.h> #include <mach/eint.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include <linux/jiffies.h> diff --git a/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c b/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c index ec9e02f84..8506baef4 100644 --- a/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c +++ b/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c @@ -41,7 +41,7 @@ #include <linux/completion.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include <asm/unaligned.h> #include <mach/eint.h> diff --git a/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c b/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c index 62e034af5..21083e1ea 100644 --- a/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c +++ b/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c @@ -22,7 +22,7 @@ #include <linux/dma-mapping.h> #include <linux/mm_types.h> #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <linux/vmalloc.h> diff --git a/drivers/input/touchscreen/mediatek/mtk_tpd.c b/drivers/input/touchscreen/mediatek/mtk_tpd.c index 0917d7842..d4a45c88b 100644 --- a/drivers/input/touchscreen/mediatek/mtk_tpd.c +++ b/drivers/input/touchscreen/mediatek/mtk_tpd.c @@ -26,7 +26,7 @@ #include <linux/miscdevice.h> #include <linux/device.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_COMPAT #include <linux/compat.h> diff --git a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c index e0b8f4cd5..38d27e1c0 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c +++ b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c @@ -48,7 +48,7 @@ #include <mach/mt_typedefs.h> #include <mach/mt_boot.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include "tpd.h" diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c index a753e235c..4ea6d9792 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c @@ -50,7 +50,7 @@ #include <mach/mt_typedefs.h> #include <mach/mt_boot.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include "tpd.h" diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c index 63ae54df9..72cb3a25f 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c @@ -50,7 +50,7 @@ #include <mach/mt_typedefs.h> #include <mach/mt_boot.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include "tpd.h" diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c index c4d06701d..c27292392 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c @@ -50,7 +50,7 @@ #include <mach/mt_typedefs.h> #include <mach/mt_boot.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include "tpd.h" diff --git a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c index 5dc9a8fe7..965b258a1 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c @@ -50,7 +50,7 @@ #include <mach/mt_typedefs.h> #include <mach/mt_boot.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include "tpd.h" diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c index 0d8f1b7c6..c169f2904 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c +++ b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c @@ -50,7 +50,7 @@ #include <mach/mt_typedefs.h> #include <mach/mt_boot.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_eint.h> #include "tpd.h" diff --git a/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c b/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c index 4f547668f..480c24d7e 100644 --- a/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c +++ b/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c @@ -19,7 +19,7 @@ #include <linux/rtpm_prio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "tpd.h" diff --git a/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c b/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c index 51197f712..866f79058 100644 --- a/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c +++ b/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c @@ -18,7 +18,7 @@ #ifdef TPD_UPDATE_FIRMWARE #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/namei.h> #include <linux/vmalloc.h> diff --git a/drivers/input/touchscreen/mediatek/tpd_debug.c b/drivers/input/touchscreen/mediatek/tpd_debug.c index 52370cbe2..214b091a4 100644 --- a/drivers/input/touchscreen/mediatek/tpd_debug.c +++ b/drivers/input/touchscreen/mediatek/tpd_debug.c @@ -1,5 +1,5 @@ #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/major.h> #include <linux/miscdevice.h> #include <linux/i2c.h> diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index c123709ac..dde8dbbcb 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c @@ -28,7 +28,7 @@ #include <linux/moduleparam.h> #include <linux/delay.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/isdn/capicmd.h> #include <linux/isdn/capiutil.h> #ifdef AVMB1_COMPAT diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c index 4d9b19554..9fdbd99c7 100644 --- a/drivers/isdn/hardware/avm/b1.c +++ b/drivers/isdn/hardware/avm/b1.c @@ -24,7 +24,7 @@ #include <linux/slab.h> #include <asm/io.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/netdevice.h> #include <linux/isdn/capilli.h> #include "avmcard.h" diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c index 19b113fae..818bd8f23 100644 --- a/drivers/isdn/hardware/avm/b1dma.c +++ b/drivers/isdn/hardware/avm/b1dma.c @@ -23,7 +23,7 @@ #include <linux/gfp.h> #include <asm/io.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/netdevice.h> #include <linux/isdn/capilli.h> #include "avmcard.h" diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c index 5d00d72fe..17beb2869 100644 --- a/drivers/isdn/hardware/avm/c4.c +++ b/drivers/isdn/hardware/avm/c4.c @@ -24,7 +24,7 @@ #include <linux/init.h> #include <linux/gfp.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/netdevice.h> #include <linux/isdn/capicmd.h> #include <linux/isdn/capiutil.h> diff --git a/drivers/isdn/hardware/eicon/capimain.c b/drivers/isdn/hardware/eicon/capimain.c index 997d46abf..be36d8200 100644 --- a/drivers/isdn/hardware/eicon/capimain.c +++ b/drivers/isdn/hardware/eicon/capimain.c @@ -13,7 +13,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/seq_file.h> #include <linux/skbuff.h> diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c index 48db08d0b..93d1975f0 100644 --- a/drivers/isdn/hardware/eicon/divamnt.c +++ b/drivers/isdn/hardware/eicon/divamnt.c @@ -15,7 +15,7 @@ #include <linux/kernel.h> #include <linux/poll.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "platform.h" #include "di_defs.h" diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c index 4103a8c17..cb88090f9 100644 --- a/drivers/isdn/hardware/eicon/divasi.c +++ b/drivers/isdn/hardware/eicon/divasi.c @@ -18,7 +18,7 @@ #include <linux/proc_fs.h> #include <linux/skbuff.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "platform.h" #include "di_defs.h" diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index 52377b4bf..65adf3da5 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c @@ -12,7 +12,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/kernel.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/ioport.h> #include <linux/pci.h> diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c index 56ce98a4e..b57efd6ad 100644 --- a/drivers/isdn/hardware/eicon/divasproc.c +++ b/drivers/isdn/hardware/eicon/divasproc.c @@ -16,7 +16,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/list.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "platform.h" #include "debuglib.h" diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c index eda4741e3..4a0425378 100644 --- a/drivers/isdn/hysdn/hysdn_boot.c +++ b/drivers/isdn/hysdn/hysdn_boot.c @@ -13,7 +13,7 @@ #include <linux/vmalloc.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "hysdn_defs.h" #include "hysdn_pof.h" diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c index 19da22249..535594d9e 100644 --- a/drivers/lguest/core.c +++ b/drivers/lguest/core.c @@ -15,7 +15,7 @@ #include <linux/slab.h> #include <asm/paravirt.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/poll.h> #include <asm/asm-offsets.h> #include "lg.h" diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index 5b9ac3280..0ea01f6f2 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c @@ -16,7 +16,7 @@ #include <linux/random.h> #include <linux/percpu.h> #include <asm/tlbflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "lg.h" /*M:008 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index 516923926..672f803f7 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c @@ -45,7 +45,7 @@ #include <asm/desc.h> #include <asm/setup.h> #include <asm/lguest.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/i387.h> #include "../lg.h" diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index b02689620..6b9db881a 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c @@ -38,7 +38,7 @@ #include <linux/platform_device.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_PPC #include <asm/prom.h> #include <asm/machdep.h> diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c index 1a57e88a3..701e1fdbd 100644 --- a/drivers/macintosh/ans-lcd.c +++ b/drivers/macintosh/ans-lcd.c @@ -11,7 +11,7 @@ #include <linux/delay.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sections.h> #include <asm/prom.h> #include <asm/io.h> diff --git a/drivers/macintosh/nvram.c b/drivers/macintosh/nvram.c index f0e03e793..bf3501a4f 100644 --- a/drivers/macintosh/nvram.c +++ b/drivers/macintosh/nvram.c @@ -13,7 +13,7 @@ #include <linux/fcntl.h> #include <linux/nvram.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/nvram.h> #define NVRAM_SIZE 8192 diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index b3b2d36c0..58a51673e 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c @@ -45,7 +45,7 @@ #include <asm/pmac_feature.h> #include <asm/smu.h> #include <asm/sections.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define VERSION "0.7" #define AUTHOR "(c) 2005 Benjamin Herrenschmidt, IBM Corp." diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 283e1b53c..aa568eefc 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -55,7 +55,7 @@ #include <asm/pmac_feature.h> #include <asm/pmac_pfunc.h> #include <asm/pmac_low_i2c.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/cputable.h> #include <asm/time.h> diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index a00ee41f0..a411c5cb7 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c @@ -38,7 +38,7 @@ #include <asm/pgtable.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Misc minor number allocated for /dev/pmu */ #define PMU_MINOR 154 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 85f45aa6c..221b984ea 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -17,7 +17,7 @@ #include <linux/hdreg.h> #include <linux/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DM_MSG_PREFIX "ioctl" #define DM_DRIVER_EMAIL "dm-devel@redhat.com" diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c index 0b4616b87..16cd3f65f 100644 --- a/drivers/media/dvb-core/dmxdev.c +++ b/drivers/media/dvb-core/dmxdev.c @@ -28,7 +28,7 @@ #include <linux/poll.h> #include <linux/ioctl.h> #include <linux/wait.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "dmxdev.h" static int debug; diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c index 3485655fa..703d58101 100644 --- a/drivers/media/dvb-core/dvb_demux.c +++ b/drivers/media/dvb-core/dvb_demux.c @@ -29,7 +29,7 @@ #include <linux/poll.h> #include <linux/string.h> #include <linux/crc32.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/div64.h> #include "dvb_demux.h" diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c index f91c80c0e..9529759cc 100644 --- a/drivers/media/dvb-core/dvb_net.c +++ b/drivers/media/dvb-core/dvb_net.c @@ -60,7 +60,7 @@ #include <linux/etherdevice.h> #include <linux/dvb/net.h> #include <linux/uio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/crc32.h> #include <linux/mutex.h> #include <linux/sched.h> diff --git a/drivers/media/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb-core/dvb_ringbuffer.c index a5712cd7c..92533be15 100644 --- a/drivers/media/dvb-core/dvb_ringbuffer.c +++ b/drivers/media/dvb-core/dvb_ringbuffer.c @@ -31,7 +31,7 @@ #include <linux/module.h> #include <linux/sched.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "dvb_ringbuffer.h" diff --git a/drivers/media/i2c/adv7170.c b/drivers/media/i2c/adv7170.c index 6bc01fb98..51ef82bee 100644 --- a/drivers/media/i2c/adv7170.c +++ b/drivers/media/i2c/adv7170.c @@ -32,7 +32,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/adv7175.c b/drivers/media/i2c/adv7175.c index c7640fab5..e6646fb8c 100644 --- a/drivers/media/i2c/adv7175.c +++ b/drivers/media/i2c/adv7175.c @@ -28,7 +28,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/bt856.c b/drivers/media/i2c/bt856.c index 7e5bd365c..4e6b995f3 100644 --- a/drivers/media/i2c/bt856.c +++ b/drivers/media/i2c/bt856.c @@ -32,7 +32,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/bt866.c b/drivers/media/i2c/bt866.c index 905320b67..24eb50ba9 100644 --- a/drivers/media/i2c/bt866.c +++ b/drivers/media/i2c/bt866.c @@ -32,7 +32,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/cs53l32a.c b/drivers/media/i2c/cs53l32a.c index b29391220..46165888b 100644 --- a/drivers/media/i2c/cs53l32a.c +++ b/drivers/media/i2c/cs53l32a.c @@ -24,7 +24,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/m52790.c b/drivers/media/i2c/m52790.c index 39f50fd2b..d3778c2ae 100644 --- a/drivers/media/i2c/m52790.c +++ b/drivers/media/i2c/m52790.c @@ -24,7 +24,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/m52790.h> diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c index b4e1ccbd8..1f1597c7e 100644 --- a/drivers/media/i2c/saa6588.c +++ b/drivers/media/i2c/saa6588.c @@ -29,7 +29,7 @@ #include <linux/slab.h> #include <linux/poll.h> #include <linux/wait.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <media/saa6588.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/saa7110.c b/drivers/media/i2c/saa7110.c index 51cd4c8f0..ad22504bf 100644 --- a/drivers/media/i2c/saa7110.c +++ b/drivers/media/i2c/saa7110.c @@ -31,7 +31,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/wait.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/saa7185.c b/drivers/media/i2c/saa7185.c index 2c6b65c76..faffd1e89 100644 --- a/drivers/media/i2c/saa7185.c +++ b/drivers/media/i2c/saa7185.c @@ -28,7 +28,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/tlv320aic23b.c b/drivers/media/i2c/tlv320aic23b.c index 809a75a55..469a77cc2 100644 --- a/drivers/media/i2c/tlv320aic23b.c +++ b/drivers/media/i2c/tlv320aic23b.c @@ -27,7 +27,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/vp27smpx.c b/drivers/media/i2c/vp27smpx.c index e71f13969..d3f2b101a 100644 --- a/drivers/media/i2c/vp27smpx.c +++ b/drivers/media/i2c/vp27smpx.c @@ -25,7 +25,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c index 2f67b4c5c..25b2efffc 100644 --- a/drivers/media/i2c/vpx3220.c +++ b/drivers/media/i2c/vpx3220.c @@ -23,7 +23,7 @@ #include <linux/delay.h> #include <linux/types.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/wm8739.c b/drivers/media/i2c/wm8739.c index 3bb99e93f..eba14d705 100644 --- a/drivers/media/i2c/wm8739.c +++ b/drivers/media/i2c/wm8739.c @@ -25,7 +25,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/i2c/wm8775.c b/drivers/media/i2c/wm8775.c index e5f3a78cf..6c29e45b0 100644 --- a/drivers/media/i2c/wm8775.c +++ b/drivers/media/i2c/wm8775.c @@ -29,7 +29,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c index 06231b85e..6e91363c1 100644 --- a/drivers/media/parport/bw-qcam.c +++ b/drivers/media/parport/bw-qcam.c @@ -73,7 +73,7 @@ OTHER DEALINGS IN THE SOFTWARE. #include <linux/sched.h> #include <linux/videodev2.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-device.h> diff --git a/drivers/media/parport/c-qcam.c b/drivers/media/parport/c-qcam.c index ec51e1f12..50dda4165 100644 --- a/drivers/media/parport/c-qcam.c +++ b/drivers/media/parport/c-qcam.c @@ -36,7 +36,7 @@ #include <linux/mutex.h> #include <linux/jiffies.h> #include <linux/videodev2.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <media/v4l2-device.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h index bc309f42c..25194ebd8 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.h +++ b/drivers/media/pci/ivtv/ivtv-driver.h @@ -53,7 +53,7 @@ #include <linux/kthread.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <linux/dvb/video.h> diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c index 2381b0543..467d920b6 100644 --- a/drivers/media/pci/meye/meye.c +++ b/drivers/media/pci/meye/meye.c @@ -37,7 +37,7 @@ #include <media/v4l2-ioctl.h> #include <media/v4l2-fh.h> #include <media/v4l2-event.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/media/pci/zoran/videocodec.c b/drivers/media/pci/zoran/videocodec.c index c01071635..698c2f726 100644 --- a/drivers/media/pci/zoran/videocodec.c +++ b/drivers/media/pci/zoran/videocodec.c @@ -40,7 +40,7 @@ #ifdef CONFIG_PROC_FS #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #endif #include "videocodec.h" diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c index d133c30c3..b1440e59a 100644 --- a/drivers/media/pci/zoran/zoran_driver.c +++ b/drivers/media/pci/zoran/zoran_driver.c @@ -65,7 +65,7 @@ #include <asm/byteorder.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> #include <linux/mutex.h> diff --git a/drivers/media/platform/arv.c b/drivers/media/platform/arv.c index e346d32d0..8619b00d3 100644 --- a/drivers/media/platform/arv.c +++ b/drivers/media/platform/arv.c @@ -34,7 +34,7 @@ #include <media/v4l2-fh.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/m32r.h> #include <asm/io.h> #include <asm/dma.h> diff --git a/drivers/media/usb/pvrusb2/pvrusb2-ioread.c b/drivers/media/usb/pvrusb2/pvrusb2-ioread.c index bba6115c9..5f1126e4d 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-ioread.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-ioread.c @@ -25,7 +25,7 @@ #include <linux/mm.h> #include <linux/slab.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define BUFFER_COUNT 32 #define BUFFER_SIZE PAGE_ALIGN(0x4000) diff --git a/drivers/media/usb/pwc/pwc-ctrl.c b/drivers/media/usb/pwc/pwc-ctrl.c index 3a1618580..655cef39e 100644 --- a/drivers/media/usb/pwc/pwc-ctrl.c +++ b/drivers/media/usb/pwc/pwc-ctrl.c @@ -39,7 +39,7 @@ /* Control functions for the cam; brightness, contrast, video mode, etc. */ #ifdef __KERNEL__ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #endif #include <asm/errno.h> diff --git a/drivers/media/usb/sn9c102/sn9c102_core.c b/drivers/media/usb/sn9c102/sn9c102_core.c index c957e9aa6..53391fded 100644 --- a/drivers/media/usb/sn9c102/sn9c102_core.c +++ b/drivers/media/usb/sn9c102/sn9c102_core.c @@ -37,7 +37,7 @@ #include <linux/page-flags.h> #include <asm/byteorder.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sn9c102.h" diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index ec9a4fa3b..651e0d8e1 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -54,7 +54,7 @@ #if defined(CONFIG_SPI) #include <linux/spi/spi.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> #include <asm/div64.h> diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c index 5923c5dfa..99f0ad7cd 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c @@ -25,7 +25,7 @@ #include <linux/init.h> #include <linux/kmod.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h> diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index dcc8385ad..ca6ad9ce6 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c @@ -58,7 +58,7 @@ #include <linux/compat.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h index 69e9d5463..8946e19db 100644 --- a/drivers/message/fusion/mptlan.h +++ b/drivers/message/fusion/mptlan.h @@ -70,7 +70,7 @@ #include <linux/workqueue.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /* Override mptbase.h by pre-defining these! */ diff --git a/drivers/message/i2o/config-osm.c b/drivers/message/i2o/config-osm.c index 3bba7aa82..2731dceab 100644 --- a/drivers/message/i2o/config-osm.c +++ b/drivers/message/i2o/config-osm.c @@ -19,7 +19,7 @@ #include <linux/namei.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define OSM_NAME "config-osm" #define OSM_VERSION "1.323" diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index a60c188c2..50126de30 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c @@ -35,7 +35,7 @@ #include <linux/compat.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "core.h" diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c index b7d87cd22..9ce9af32f 100644 --- a/drivers/message/i2o/i2o_proc.c +++ b/drivers/message/i2o/i2o_proc.c @@ -50,7 +50,7 @@ #include <linux/workqueue.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> /* Structure used to define /proc entries */ diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index ce5b75616..a02f35e69 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c @@ -76,7 +76,7 @@ #include <linux/fs.h> #include <linux/pagemap.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include "ibmasm.h" #include "remote.h" diff --git a/drivers/misc/ltr559.c b/drivers/misc/ltr559.c index e787602ff..8ca9062aa 100644 --- a/drivers/misc/ltr559.c +++ b/drivers/misc/ltr559.c @@ -30,7 +30,7 @@ #include <linux/slab.h> #include <linux/wakelock.h> #include <linux/workqueue.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/types.h> #include <asm/setup.h> #include <linux/version.h> diff --git a/drivers/misc/mediatek/accdet/mt6735/accdet.h b/drivers/misc/mediatek/accdet/mt6735/accdet.h index 2899e201e..e1ea6eb03 100644 --- a/drivers/misc/mediatek/accdet/mt6735/accdet.h +++ b/drivers/misc/mediatek/accdet/mt6735/accdet.h @@ -14,7 +14,7 @@ #include <linux/ctype.h> #include <linux/semaphore.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/workqueue.h> #include <linux/switch.h> @@ -24,7 +24,7 @@ #include <linux/kdev_t.h> #include <linux/fs.h> #include <linux/cdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kthread.h> #include <linux/input.h> #include <linux/wakelock.h> diff --git a/drivers/misc/mediatek/accdet/mt6735/accdet_hal.h b/drivers/misc/mediatek/accdet/mt6735/accdet_hal.h index 9ce1310a9..388b22ff0 100644 --- a/drivers/misc/mediatek/accdet/mt6735/accdet_hal.h +++ b/drivers/misc/mediatek/accdet/mt6735/accdet_hal.h @@ -14,7 +14,7 @@ #include <linux/ctype.h> #include <linux/semaphore.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/workqueue.h> #include <linux/switch.h> @@ -24,7 +24,7 @@ #include <linux/kdev_t.h> #include <linux/fs.h> #include <linux/cdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kthread.h> #include <linux/input.h> #include <linux/wakelock.h> diff --git a/drivers/misc/mediatek/accdet/mt6735/ts3a225e.c b/drivers/misc/mediatek/accdet/mt6735/ts3a225e.c index 69e12f4fb..cd0b8b641 100644 --- a/drivers/misc/mediatek/accdet/mt6735/ts3a225e.c +++ b/drivers/misc/mediatek/accdet/mt6735/ts3a225e.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c b/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c index 7551e26ec..35116fc4d 100644 --- a/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c +++ b/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c b/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c index 41214152d..c9e7b8df5 100644 --- a/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c +++ b/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c b/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c index f94c76f05..2cc769be9 100644 --- a/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c +++ b/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma050/bma050.c b/drivers/misc/mediatek/accelerometer/bma050/bma050.c index 2e5934728..58b83166f 100644 --- a/drivers/misc/mediatek/accelerometer/bma050/bma050.c +++ b/drivers/misc/mediatek/accelerometer/bma050/bma050.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma056/bma056.c b/drivers/misc/mediatek/accelerometer/bma056/bma056.c index 3369d0b03..09ade4e30 100644 --- a/drivers/misc/mediatek/accelerometer/bma056/bma056.c +++ b/drivers/misc/mediatek/accelerometer/bma056/bma056.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c b/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c index a6c2b9871..a2eb5a890 100644 --- a/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c +++ b/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c b/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c index 86aa76994..09fc58701 100644 --- a/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c +++ b/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma250/bma250.c b/drivers/misc/mediatek/accelerometer/bma250/bma250.c index 396db1c28..54697e70c 100644 --- a/drivers/misc/mediatek/accelerometer/bma250/bma250.c +++ b/drivers/misc/mediatek/accelerometer/bma250/bma250.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma250e/bma250.c b/drivers/misc/mediatek/accelerometer/bma250e/bma250.c index 53d5a8edd..af29a1fdc 100644 --- a/drivers/misc/mediatek/accelerometer/bma250e/bma250.c +++ b/drivers/misc/mediatek/accelerometer/bma250e/bma250.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c b/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c index 3dc22e039..ff060c8b4 100644 --- a/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c +++ b/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c b/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c index 9e03791f9..370e69aa3 100644 --- a/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c +++ b/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c b/drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c index 07574a265..ed5483df9 100644 --- a/drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c +++ b/drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c @@ -19,7 +19,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/inc/accel_factory.h b/drivers/misc/mediatek/accelerometer/inc/accel_factory.h index 0a9fa1706..2c0de6f62 100644 --- a/drivers/misc/mediatek/accelerometer/inc/accel_factory.h +++ b/drivers/misc/mediatek/accelerometer/inc/accel_factory.h @@ -6,7 +6,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c b/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c index 72a51302d..af7fe8a3a 100644 --- a/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c +++ b/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c b/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c index b9e2ee114..26e4829ca 100644 --- a/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c +++ b/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c b/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c index cb6c617d6..f5417397d 100644 --- a/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c +++ b/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c b/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c index 013ade768..a0450807e 100644 --- a/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c +++ b/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c @@ -45,7 +45,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c b/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c index 0b2606d4e..71d410767 100644 --- a/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c +++ b/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c @@ -39,7 +39,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c b/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c index 5086d724c..3b42499e4 100644 --- a/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c +++ b/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c index a972b92bf..738d7f2fb 100644 --- a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c +++ b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c index c173ab0b1..d1adb2251 100644 --- a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c +++ b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c b/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c index ebb0c358d..7c24a3b17 100644 --- a/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c +++ b/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c b/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c index db5b783bf..49d720d00 100644 --- a/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c +++ b/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c b/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c index 84038b5ba..1bedf174e 100644 --- a/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c +++ b/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c @@ -27,7 +27,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/aee/aed/aed-debug.c b/drivers/misc/mediatek/aee/aed/aed-debug.c index cdb683487..63182070a 100644 --- a/drivers/misc/mediatek/aee/aed/aed-debug.c +++ b/drivers/misc/mediatek/aee/aed/aed-debug.c @@ -9,7 +9,7 @@ #include <linux/cpumask.h> #include <linux/slab.h> #include <linux/kdebug.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #if defined(CONFIG_ARM_PSCI) || (CONFIG_ARM64) #include <mach/mt_secure_api.h> #endif diff --git a/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c b/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c index 549140ab6..4db7b90c6 100644 --- a/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c +++ b/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c b/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c index 13a0133a5..f5681e99a 100644 --- a/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c +++ b/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c b/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c index 1570ad07e..8796f3087 100644 --- a/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c +++ b/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/aal_control.c b/drivers/misc/mediatek/alsps/aal_control.c index 1971780e1..2e87422b8 100644 --- a/drivers/misc/mediatek/alsps/aal_control.c +++ b/drivers/misc/mediatek/alsps/aal_control.c @@ -4,7 +4,7 @@ #include <linux/init.h> #include <linux/types.h> #include <linux/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "alsps.h" #include "aal_control.h" #include <linux/hwmsen_dev.h> diff --git a/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c b/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c index 5eccbaa43..76a089bc6 100644 --- a/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c +++ b/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c b/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c index 8ca2b536d..1795fd178 100644 --- a/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c +++ b/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c b/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c index c6ae837ca..6c73d79f8 100644 --- a/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c +++ b/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/cm36283/cm36283.c b/drivers/misc/mediatek/alsps/cm36283/cm36283.c index a339e53e4..b20d71061 100644 --- a/drivers/misc/mediatek/alsps/cm36283/cm36283.c +++ b/drivers/misc/mediatek/alsps/cm36283/cm36283.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c b/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c index ae286ab03..d9ba00e45 100644 --- a/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c +++ b/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/epl2182/epl2182.c b/drivers/misc/mediatek/alsps/epl2182/epl2182.c index 5ca840381..348992e32 100644 --- a/drivers/misc/mediatek/alsps/epl2182/epl2182.c +++ b/drivers/misc/mediatek/alsps/epl2182/epl2182.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/inc/alsps_factory.h b/drivers/misc/mediatek/alsps/inc/alsps_factory.h index 3c544362c..8ca895073 100644 --- a/drivers/misc/mediatek/alsps/inc/alsps_factory.h +++ b/drivers/misc/mediatek/alsps/inc/alsps_factory.h @@ -6,7 +6,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/rpr410/rpr410.c b/drivers/misc/mediatek/alsps/rpr410/rpr410.c index 36e5dab20..07b1d82bb 100644 --- a/drivers/misc/mediatek/alsps/rpr410/rpr410.c +++ b/drivers/misc/mediatek/alsps/rpr410/rpr410.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c b/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c index 6658dba2b..478c63e8c 100644 --- a/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c +++ b/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c b/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c index a9923b327..adc8aaa1d 100644 --- a/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c +++ b/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c b/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c index b4b3a7d89..746eadaac 100644 --- a/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c +++ b/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c b/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c index 9f786b457..455737afe 100644 --- a/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c +++ b/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c b/drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c index 4e661bbb9..699478b07 100644 --- a/drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c +++ b/drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c @@ -37,7 +37,7 @@ #include <linux/proc_fs.h> #include <linux/kthread.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/misc/mediatek/auxadc/mt_auxadc.c b/drivers/misc/mediatek/auxadc/mt_auxadc.c index b89dbf132..c82068608 100644 --- a/drivers/misc/mediatek/auxadc/mt_auxadc.c +++ b/drivers/misc/mediatek/auxadc/mt_auxadc.c @@ -38,7 +38,7 @@ #include <linux/kthread.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> #include <mach/mt_gpt.h> diff --git a/drivers/misc/mediatek/barometer/inc/barometer_factory.h b/drivers/misc/mediatek/barometer/inc/barometer_factory.h index 9c0caecbe..da3d3e679 100644 --- a/drivers/misc/mediatek/barometer/inc/barometer_factory.h +++ b/drivers/misc/mediatek/barometer/inc/barometer_factory.h @@ -6,7 +6,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/barometer/ms5607/ms5607.c b/drivers/misc/mediatek/barometer/ms5607/ms5607.c index 33a99fdcb..70e99017c 100644 --- a/drivers/misc/mediatek/barometer/ms5607/ms5607.c +++ b/drivers/misc/mediatek/barometer/ms5607/ms5607.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c b/drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c index f380a5a07..41a577894 100644 --- a/drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c +++ b/drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c @@ -77,7 +77,7 @@ #include <linux/xlog.h> #include <mach/irqs.h> #include <mach/mt_irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/drivers/misc/mediatek/bthid/hid_keyboard.c b/drivers/misc/mediatek/bthid/hid_keyboard.c index 9270d98ff..34aa72843 100644 --- a/drivers/misc/mediatek/bthid/hid_keyboard.c +++ b/drivers/misc/mediatek/bthid/hid_keyboard.c @@ -15,7 +15,7 @@ #include <linux/device.h> #include <linux/errno.h> #include <asm/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define HID_SAY "HID:" diff --git a/drivers/misc/mediatek/ccci_util/ccci_private_log.c b/drivers/misc/mediatek/ccci_util/ccci_private_log.c index eabd8e806..33c0cf76a 100644 --- a/drivers/misc/mediatek/ccci_util/ccci_private_log.c +++ b/drivers/misc/mediatek/ccci_util/ccci_private_log.c @@ -3,7 +3,7 @@ #include <linux/spinlock.h> #include <linux/smp.h> #include <linux/poll.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/wait.h> #include <linux/sched.h> #include <linux/skbuff.h> diff --git a/drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c b/drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c index 556d211d2..dae6fc757 100644 --- a/drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c +++ b/drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c @@ -25,7 +25,7 @@ #include <linux/spinlock.h> #include <linux/delay.h> /* udelay() */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/system.h> #endif #include "stp_core.h" diff --git a/drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h b/drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h index 4b3bbc2ce..a7d7036b7 100644 --- a/drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h +++ b/drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h @@ -19,7 +19,7 @@ #include <linux/sched.h> #include <linux/poll.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> #include <linux/workqueue.h> #include <linux/wait.h> diff --git a/drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c b/drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c index 06052d002..98e911f52 100644 --- a/drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c +++ b/drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c @@ -6,7 +6,7 @@ #include <linux/cdev.h> #include <linux/sched.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/poll.h> #include <linux/time.h> diff --git a/drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c b/drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c index ba980993e..35d8132bd 100644 --- a/drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c +++ b/drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c @@ -6,7 +6,7 @@ #include <linux/cdev.h> #include <linux/sched.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/poll.h> #include <linux/time.h> diff --git a/drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h b/drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h index 7e152bfd3..93c350da8 100644 --- a/drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h +++ b/drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h @@ -25,7 +25,7 @@ #include <linux/sched.h> #include <linux/poll.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> #include <linux/wait.h> #include <linux/time.h> diff --git a/drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h b/drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h index 6f8942e68..f830e026b 100644 --- a/drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h +++ b/drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h @@ -24,7 +24,7 @@ #include <linux/sched.h> #include <linux/poll.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> #include <linux/workqueue.h> #include <linux/wait.h> diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h index 67381e4c9..f14d4f6c7 100644 --- a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h +++ b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h @@ -31,7 +31,7 @@ #include <linux/sched.h> #include <linux/poll.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/proc_fs.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c index f7f4aff01..15d3717bb 100644 --- a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c +++ b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c @@ -39,7 +39,7 @@ #include <linux/spinlock.h> #include <linux/delay.h> /* udelay() */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "osal_typedef.h" diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c index 8fdb7e172..560ee945d 100644 --- a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c +++ b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c @@ -20,7 +20,7 @@ #include <linux/cdev.h> #include <linux/sched.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/poll.h> #include <linux/time.h> diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c index a075f46b5..083601180 100644 --- a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c +++ b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c @@ -20,7 +20,7 @@ #include <linux/cdev.h> #include <linux/sched.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/poll.h> #include <linux/time.h> diff --git a/drivers/misc/mediatek/connectivity/gps/gps.c b/drivers/misc/mediatek/connectivity/gps/gps.c index f161c2389..1841f62e8 100644 --- a/drivers/misc/mediatek/connectivity/gps/gps.c +++ b/drivers/misc/mediatek/connectivity/gps/gps.c @@ -33,7 +33,7 @@ #include <linux/cdev.h> #include <linux/errno.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* #include <linux/xlog.h> */ #include <linux/printk.h> #include <linux/semaphore.h> diff --git a/drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c b/drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c index 40901a3dd..4635ba8fc 100644 --- a/drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c +++ b/drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c @@ -20,7 +20,7 @@ #include <linux/sched.h> #include <linux/wakelock.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/skbuff.h> #if WMT_CREATE_NODE_DYNAMIC || REMOVE_MK_NODE #include <linux/device.h> diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c index 4500f1ddc..ec651f0ab 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c +++ b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c @@ -59,7 +59,7 @@ #include <linux/rtnetlink.h> /* for rtnl_lock() and rtnl_unlock() */ #include <linux/kthread.h> /* kthread_should_stop(), kthread_run() */ -#include <asm/uaccess.h> /* for copy_from_user() */ +#include <linux/uaccess.h> /* for copy_from_user() */ #include <linux/fs.h> /* for firmware download */ #include <linux/vmalloc.h> diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h index e7f29e1ba..39d238174 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h +++ b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h @@ -562,7 +562,7 @@ #include <linux/rtnetlink.h> /* for rtnl_lock() and rtnl_unlock() */ #include <linux/kthread.h> /* kthread_should_stop(), kthread_run() */ -#include <asm/uaccess.h> /* for copy_from_user() */ +#include <linux/uaccess.h> /* for copy_from_user() */ #include <linux/fs.h> /* for firmware download */ #include <linux/vmalloc.h> diff --git a/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h b/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h index 4bfa68750..3b4151a9a 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h +++ b/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h @@ -562,7 +562,7 @@ #include <linux/rtnetlink.h> /* for rtnl_lock() and rtnl_unlock() */ #include <linux/kthread.h> /* kthread_should_stop(), kthread_run() */ -#include <asm/uaccess.h> /* for copy_from_user() */ +#include <linux/uaccess.h> /* for copy_from_user() */ #include <linux/fs.h> /* for firmware download */ #include <linux/vmalloc.h> diff --git a/drivers/misc/mediatek/devinfo/mt6735/devinfo.c b/drivers/misc/mediatek/devinfo/mt6735/devinfo.c index 0f16de7c3..0cc54c5dc 100644 --- a/drivers/misc/mediatek/devinfo/mt6735/devinfo.c +++ b/drivers/misc/mediatek/devinfo/mt6735/devinfo.c @@ -20,7 +20,7 @@ #include <linux/mm.h> #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ioctl.h> #include <linux/device.h> #ifdef CONFIG_OF diff --git a/drivers/misc/mediatek/devinfo/mt6735/devinfosys.c b/drivers/misc/mediatek/devinfo/mt6735/devinfosys.c index 1b0acbd42..a1ea989bb 100644 --- a/drivers/misc/mediatek/devinfo/mt6735/devinfosys.c +++ b/drivers/misc/mediatek/devinfo/mt6735/devinfosys.c @@ -19,7 +19,7 @@ #include <linux/cdev.h> #include <linux/mm.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ioctl.h> #include <linux/device.h> #include <linux/platform_device.h> diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c b/drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c index b3fd1f50e..d86411161 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c +++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c @@ -4,7 +4,7 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/leds-mt65xx.h> #include <linux/aal_api.h> diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c b/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c index 1a80ca406..cb7aebdaf 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c +++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c @@ -1,5 +1,5 @@ #include <linux/kernel.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/mutex.h> #include <mach/mt_clkmgr.h> diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h b/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h index 3ab26e508..6cd7f2555 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h +++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h @@ -1,7 +1,7 @@ #ifndef __DDP_GAMMA_H__ #define __DDP_GAMMA_H__ -#include <asm/uaccess.h> +#include <linux/uaccess.h> typedef enum { diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_od.c b/drivers/misc/mediatek/dispsys/mt6735/ddp_od.c index da958f5a2..357dac2db 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/ddp_od.c +++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_od.c @@ -6,7 +6,7 @@ #include <linux/dma-mapping.h> #include <mach/memory.h> #include "ddp_wdma.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_irq.h> #include <mach/mt_clkmgr.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/eemcs/eemcs_file_ops.c b/drivers/misc/mediatek/eemcs/eemcs_file_ops.c index 81cdb3694..9f6b0656c 100644 --- a/drivers/misc/mediatek/eemcs/eemcs_file_ops.c +++ b/drivers/misc/mediatek/eemcs/eemcs_file_ops.c @@ -6,7 +6,7 @@ #include <linux/mm.h> #include <linux/namei.h> #include <asm/segment.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct file* file_open(const char* path, int flags, int rights) { struct file* filp = NULL; diff --git a/drivers/misc/mediatek/eemcs/eemcs_file_ops.h b/drivers/misc/mediatek/eemcs/eemcs_file_ops.h index c9b0224f6..4a26010df 100644 --- a/drivers/misc/mediatek/eemcs/eemcs_file_ops.h +++ b/drivers/misc/mediatek/eemcs/eemcs_file_ops.h @@ -5,7 +5,7 @@ #include <linux/file.h> #include <linux/mm.h> #include <asm/segment.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct file* file_open(const char* path, int flags, int rights); void file_close(struct file* file); diff --git a/drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c b/drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c index 73d1805a6..9900ccfbc 100644 --- a/drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c +++ b/drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c @@ -1,5 +1,5 @@ #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "extd_factory.h" #include "external_display.h" diff --git a/drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c b/drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c index 610dcde0a..28bb45f95 100644 --- a/drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c +++ b/drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c @@ -27,7 +27,7 @@ #include <linux/switch.h> #include <linux/mmprofile.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> //#include <asm/mach-types.h> #include <asm/cacheflush.h> diff --git a/drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c b/drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c index 00714fca7..1db3b600f 100644 --- a/drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c +++ b/drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c @@ -17,7 +17,7 @@ #include <linux/list.h> #include <linux/switch.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> //#include <asm/mach-types.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c b/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c index 9a12362e7..c332583d0 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c @@ -16,7 +16,7 @@ #include <linux/time.h> #include "kd_flashlight.h" #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <cust_gpio_usage.h> #include <cust_i2c.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c b/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c index b56e36285..261f442fd 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c @@ -16,7 +16,7 @@ #include <linux/time.h> #include "kd_flashlight.h" #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/xlog.h> //#include <mach/mt6516_typedefs.h> //#include <mach/mt6516_gpt_sw.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c b/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c index 0e8999d5b..9af83d32a 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c @@ -27,7 +27,7 @@ #include <linux/errno.h> #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <mach/upmu_sw.h> #endif diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c index 9bd53a063..2c9cfd70b 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c @@ -22,7 +22,7 @@ #include <linux/errno.h> #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <cust_gpio_usage.h> #include <linux/hrtimer.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c index c0c7e1bf1..87dc5e994 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c @@ -21,7 +21,7 @@ #include <linux/errno.h> #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <cust_gpio_usage.h> #include <linux/hrtimer.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c index 0b1e2849f..8c574b3d2 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c @@ -15,7 +15,7 @@ #include <linux/errno.h> #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <cust_gpio_usage.h> #include <linux/hrtimer.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c index 4cd059ccb..c998f01e0 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c @@ -16,7 +16,7 @@ #include <linux/errno.h> #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #ifdef CONFIG_COMPAT #include <linux/fs.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c index 662239024..8554af2df 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c @@ -16,7 +16,7 @@ #include <linux/errno.h> #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <cust_gpio_usage.h> #include <linux/hrtimer.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c index 8e026ecc4..4f96a9900 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c @@ -17,7 +17,7 @@ #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <cust_gpio_usage.h> #include <linux/hrtimer.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c index d0d8c1fd8..0e2f6ece9 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c @@ -16,7 +16,7 @@ #include <linux/errno.h> #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <cust_gpio_usage.h> #include <linux/hrtimer.h> diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c b/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c index ecaac71d2..44b499050 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c @@ -16,7 +16,7 @@ #include <linux/errno.h> #include <linux/time.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kd_camera_hw.h" #include <cust_gpio_usage.h> #include <linux/hrtimer.h> diff --git a/drivers/misc/mediatek/gpio/mt_gpio_core.c b/drivers/misc/mediatek/gpio/mt_gpio_core.c index 4183140f6..ad5461801 100644 --- a/drivers/misc/mediatek/gpio/mt_gpio_core.c +++ b/drivers/misc/mediatek/gpio/mt_gpio_core.c @@ -21,7 +21,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/cdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/atomic.h> #include <linux/miscdevice.h> diff --git a/drivers/misc/mediatek/gpu/ged/src/ged_base.c b/drivers/misc/mediatek/gpu/ged/src/ged_base.c index 91ed382ca..713c2055e 100644 --- a/drivers/misc/mediatek/gpu/ged/src/ged_base.c +++ b/drivers/misc/mediatek/gpu/ged/src/ged_base.c @@ -20,7 +20,7 @@ #endif #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> unsigned long ged_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes) { diff --git a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c index 9a0b35b05..714e62092 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c +++ b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c @@ -15,7 +15,7 @@ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/init.h> #include <linux/module.h> #include <linux/fs.h> diff --git a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c index b4d024299..8a06ef2b5 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c +++ b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c @@ -20,7 +20,7 @@ #include <linux/ump-ioctl.h> #include <linux/ump.h> -#include <asm/uaccess.h> /* copy_*_user */ +#include <linux/uaccess.h> /* copy_*_user */ #include <linux/compat.h> #include <linux/module.h> /* kernel module definitions */ #include <linux/fs.h> /* file system operations */ diff --git a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c index c2fd3c1f2..63122610b 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c +++ b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c @@ -28,7 +28,7 @@ #include <linux/seq_file.h> #include <linux/debugfs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/proc_fs.h> diff --git a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c index 9a0b35b05..714e62092 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c +++ b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c @@ -15,7 +15,7 @@ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/init.h> #include <linux/module.h> #include <linux/fs.h> diff --git a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c index b4d024299..8a06ef2b5 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c +++ b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c @@ -20,7 +20,7 @@ #include <linux/ump-ioctl.h> #include <linux/ump.h> -#include <asm/uaccess.h> /* copy_*_user */ +#include <linux/uaccess.h> /* copy_*_user */ #include <linux/compat.h> #include <linux/module.h> /* kernel module definitions */ #include <linux/fs.h> /* file system operations */ diff --git a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c index 32b8cd3a6..d6cbfac6b 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c +++ b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c @@ -28,7 +28,7 @@ #include <linux/seq_file.h> #include <linux/debugfs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/proc_fs.h> diff --git a/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c b/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c index fe63f0204..234472f44 100644 --- a/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c +++ b/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c @@ -22,7 +22,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/inc/gyro_factory.h b/drivers/misc/mediatek/gyroscope/inc/gyro_factory.h index 70fb5efdb..68582cb35 100644 --- a/drivers/misc/mediatek/gyroscope/inc/gyro_factory.h +++ b/drivers/misc/mediatek/gyroscope/inc/gyro_factory.h @@ -6,7 +6,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c b/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c index 263fbc0b5..980cc9f50 100644 --- a/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c +++ b/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c b/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c index 2d6967261..375d8977b 100644 --- a/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c +++ b/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c b/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c index 74ed90643..9582f8ba5 100644 --- a/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c +++ b/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c b/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c index 1f07c3160..bcb0b14bf 100644 --- a/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c +++ b/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c b/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c index 3babd0179..7fabd9ff2 100644 --- a/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c +++ b/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c b/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c index 0b1f90de0..8a997a8b5 100644 --- a/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c +++ b/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c b/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c index b079437bd..699d287a1 100644 --- a/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c +++ b/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c b/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c index 80f69b9e7..cb6dae43f 100644 --- a/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c +++ b/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c b/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c index 01242552c..66d266306 100644 --- a/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c +++ b/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c b/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c index d64a9fbb3..e421feced 100644 --- a/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c +++ b/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c b/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c index 3d75b2361..9a12fc9cf 100644 --- a/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c +++ b/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c b/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c index bff296970..f87b0f9a7 100644 --- a/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c +++ b/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c b/drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c index 78222847a..a6add7fc4 100644 --- a/drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c +++ b/drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c @@ -2,7 +2,7 @@ #include <linux/kernel.h> #include <linux/fs.h> #include <linux/timer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mhl_linuxdrv.h" #include "sii_hal.h" #include "mhl_linuxdrv_ioctl.h" diff --git a/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c b/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c index d66f86014..bc13a3601 100644 --- a/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c +++ b/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c @@ -11,7 +11,7 @@ #include <linux/time.h> #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/power_supply.h> #include <linux/kthread.h> #include <linux/wakelock.h> diff --git a/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c b/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c index 3a2d57b6e..58479767f 100644 --- a/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c +++ b/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c @@ -24,7 +24,7 @@ the GNU General Public License for more details at http://www.gnu.org/licenses/g #include <linux/interrupt.h> #include <linux/cdev.h> #include <linux/stringify.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sii_hal.h" #include "si_fw_macros.h" diff --git a/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c b/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c index 71e573684..2c687264c 100644 --- a/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c +++ b/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c @@ -9,7 +9,7 @@ #include <linux/time.h> #include <linux/device.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/power_supply.h> #include <linux/kthread.h> #include <linux/wakelock.h> diff --git a/drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c b/drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c index d45a102ab..314e6a132 100644 --- a/drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c +++ b/drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c @@ -6,7 +6,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h b/drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h index 9a7a8eeaa..248f99ccf 100644 --- a/drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h +++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h @@ -7,7 +7,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h b/drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h index 116fbc418..05266931a 100644 --- a/drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h +++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h @@ -7,7 +7,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c b/drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c index ddef83e6b..d973ad3bb 100644 --- a/drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c +++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c @@ -5,7 +5,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c b/drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c index 6e593cede..4c8551b29 100644 --- a/drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c +++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c @@ -5,7 +5,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h b/drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h index 853ee22e8..7ed40e66e 100644 --- a/drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h +++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h @@ -8,7 +8,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c b/drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c index 1c0747c5e..2ee7e6ee6 100644 --- a/drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c +++ b/drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c @@ -21,7 +21,7 @@ #include <linux/vmalloc.h> #include <linux/disp_assert_layer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/mach-types.h> #include <asm/cacheflush.h> @@ -39,7 +39,7 @@ #include <asm/tlbflush.h> #include <asm/page.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <generated/autoconf.h> @@ -54,7 +54,7 @@ #include <linux/kthread.h> #include <linux/rtpm_prio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/mach-types.h> #include <asm/cacheflush.h> @@ -64,7 +64,7 @@ #include <mach/irqs.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifndef TMFL_TDA19989 #define TMFL_TDA19989 diff --git a/drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c b/drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c index d334f8e8b..57d0160fe 100644 --- a/drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c +++ b/drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c @@ -61,7 +61,7 @@ #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_gpio.h> #include <linux/slab.h> #include "tmNxCompId.h" diff --git a/drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c b/drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c index 28ad7b7e9..d346af13a 100644 --- a/drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c +++ b/drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hwmon/batchsen/batch.c b/drivers/misc/mediatek/hwmon/batchsen/batch.c index 601a889fb..18e2aa1d5 100644 --- a/drivers/misc/mediatek/hwmon/batchsen/batch.c +++ b/drivers/misc/mediatek/hwmon/batchsen/batch.c @@ -2,7 +2,7 @@ #include <linux/batch.h> #include <linux/time.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static DEFINE_MUTEX(batch_data_mutex); static DEFINE_MUTEX(batch_hw_mutex); diff --git a/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c b/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c index 1c901b8f7..319ccbc9d 100644 --- a/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c +++ b/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c @@ -22,7 +22,7 @@ #include <linux/interrupt.h> #include <linux/miscdevice.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c b/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c index 1454fb19c..5ef29aac9 100644 --- a/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c +++ b/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c @@ -29,7 +29,7 @@ #include <linux/types.h> #include <linux/device.h> #include <linux/spinlock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/atomic.h> #include <linux/ctype.h> diff --git a/drivers/misc/mediatek/kernel/mtk_memcfg.c b/drivers/misc/mediatek/kernel/mtk_memcfg.c index 971d8e3c6..96cb9fc65 100644 --- a/drivers/misc/mediatek/kernel/mtk_memcfg.c +++ b/drivers/misc/mediatek/kernel/mtk_memcfg.c @@ -8,7 +8,7 @@ #include <linux/aee.h> #include <linux/kthread.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> #include <mach/mtk_memcfg.h> #include <linux/of_fdt.h> diff --git a/drivers/misc/mediatek/kernel/sec_osal.c b/drivers/misc/mediatek/kernel/sec_osal.c index 10319fee8..ed68f87f9 100644 --- a/drivers/misc/mediatek/kernel/sec_osal.c +++ b/drivers/misc/mediatek/kernel/sec_osal.c @@ -13,7 +13,7 @@ #include <linux/mtd/mtd.h> #include <linux/fs.h> #include <linux/mtd/partitions.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/version.h> #include <linux/module.h> diff --git a/drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c b/drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c index 0fb5c07c0..c9c918af9 100644 --- a/drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c +++ b/drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c @@ -4,7 +4,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c b/drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c index 958a30ba3..241dd30b8 100644 --- a/drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c +++ b/drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c @@ -4,7 +4,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c b/drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c index e30ba0364..89536c65f 100644 --- a/drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c +++ b/drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c @@ -4,7 +4,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c b/drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c index 1bf65ccc6..a6f68223a 100644 --- a/drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c +++ b/drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c @@ -4,7 +4,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c b/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c index 0f460c99f..7f3ddcb27 100644 --- a/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c +++ b/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c @@ -4,7 +4,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c b/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c index ae10206bb..6820e84dc 100644 --- a/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c +++ b/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c @@ -4,7 +4,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c b/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c index d213de426..b37b5389d 100644 --- a/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c +++ b/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c @@ -12,7 +12,7 @@ #include <linux/mm.h> #include <linux/jiffies.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <linux/vmalloc.h> #include <linux/interrupt.h> diff --git a/drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c b/drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c index bf8fd5f04..0aa6b4699 100644 --- a/drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c +++ b/drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c @@ -14,7 +14,7 @@ #include <linux/device.h> #include <linux/suspend.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlbflush.h> #include <asm/suspend.h> diff --git a/drivers/misc/mediatek/mach/mt6735/fliper/fliper.c b/drivers/misc/mediatek/mach/mt6735/fliper/fliper.c index 82dac77c1..569041059 100644 --- a/drivers/misc/mediatek/mach/mt6735/fliper/fliper.c +++ b/drivers/misc/mediatek/mach/mt6735/fliper/fliper.c @@ -5,7 +5,7 @@ #include <linux/utsname.h> #include <linux/module.h> #include <linux/moduleparam.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/printk.h> #include <linux/platform_device.h> diff --git a/drivers/misc/mediatek/mach/mt6735/hibernate64.c b/drivers/misc/mediatek/mach/mt6735/hibernate64.c index b264cf135..fbe7a1ff7 100644 --- a/drivers/misc/mediatek/mach/mt6735/hibernate64.c +++ b/drivers/misc/mediatek/mach/mt6735/hibernate64.c @@ -12,7 +12,7 @@ #include <linux/suspend.h> #include <linux/mm.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h> #include <asm/system_misc.h> diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h b/drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h index b17629661..783869b6e 100644 --- a/drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h +++ b/drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h @@ -8,7 +8,7 @@ #include <linux/interrupt.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mach/sync_write.h" #include "mach/mt_reg_base.h" diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c index 492b9b663..6e49e0189 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c @@ -17,7 +17,7 @@ #include <linux/wait.h> #include <linux/spinlock.h> #include <linux/semaphore.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include "yusu_android_speaker.h" diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h index 74a377109..efbc5f15a 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h @@ -48,7 +48,7 @@ #include <linux/time.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /***************************PART1:ON/OFF define*******************************/ diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h index 2ca6f89fb..5ebb0b54b 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h @@ -21,7 +21,7 @@ #ifndef GT1X_TPD_CUSTOM_H__ #define GT1X_TPD_CUSTOM_H__ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/rtpm_prio.h> #include <mach/mt_pm_ldo.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h index 60121299f..1fbd560d0 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h @@ -27,7 +27,7 @@ #include <linux/rtpm_prio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_pm_ldo.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h index d414387fd..48bd0fe7f 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h @@ -27,7 +27,7 @@ #include <linux/rtpm_prio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_pm_ldo.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c index 492b9b663..6e49e0189 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c @@ -17,7 +17,7 @@ #include <linux/wait.h> #include <linux/spinlock.h> #include <linux/semaphore.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include "yusu_android_speaker.h" diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h index 74a377109..efbc5f15a 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h @@ -48,7 +48,7 @@ #include <linux/time.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /***************************PART1:ON/OFF define*******************************/ diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h index 2ca6f89fb..5ebb0b54b 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h @@ -21,7 +21,7 @@ #ifndef GT1X_TPD_CUSTOM_H__ #define GT1X_TPD_CUSTOM_H__ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/rtpm_prio.h> #include <mach/mt_pm_ldo.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h index 60121299f..1fbd560d0 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h @@ -27,7 +27,7 @@ #include <linux/rtpm_prio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_pm_ldo.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h index d414387fd..48bd0fe7f 100644 --- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h +++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h @@ -27,7 +27,7 @@ #include <linux/rtpm_prio.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_pm_ldo.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c index 5050c81f2..4a426f9cd 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c @@ -7,7 +7,7 @@ #include <linux/spinlock.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/smp.h> diff --git a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c index 04379232d..5b0b16fab 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c @@ -7,7 +7,7 @@ #include <linux/spinlock.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/smp.h> diff --git a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c index d2874d906..339c41efb 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c @@ -7,7 +7,7 @@ #include <linux/spinlock.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/smp.h> diff --git a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c index fba266b58..cc96dd276 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c @@ -7,7 +7,7 @@ #include <linux/spinlock.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/smp.h> diff --git a/drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c b/drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c index b1a470916..e9999b3b5 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c @@ -18,7 +18,7 @@ #include <linux/xlog.h> #include <linux/jiffies.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/seq_file.h> #include "mach/sync_write.h" diff --git a/drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c b/drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c index 378364dbf..05f9094a8 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c @@ -32,7 +32,7 @@ #include <linux/of_address.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mach/mt_typedefs.h" #include "mach/mt_clkmgr.h" diff --git a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c index 33d4ceba5..c3403a4ad 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c @@ -12,7 +12,7 @@ #include <linux/init.h> //module_init, module_exit #include <linux/proc_fs.h> //proc_mkdir, proc_create #include <linux/seq_file.h> //seq_printf, single_open -#include <asm/uaccess.h> //copy_from_user +#include <linux/uaccess.h> //copy_from_user // project includes #include <mach/hotplug.h> diff --git a/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c b/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c index f6cbdca13..c14b0aeb1 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c @@ -12,7 +12,7 @@ #include <linux/xlog.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mach/irqs.h" #include "mach/sync_write.h" diff --git a/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c b/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c index 58f69a242..2827cd726 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c @@ -9,7 +9,7 @@ #include <linux/init.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_typedefs.h> #include <mach/mt_pm_ldo.h> diff --git a/drivers/misc/mediatek/magnetometer/af7133/af7133.c b/drivers/misc/mediatek/magnetometer/af7133/af7133.c index fcde86a14..b2b5c7d10 100644 --- a/drivers/misc/mediatek/magnetometer/af7133/af7133.c +++ b/drivers/misc/mediatek/magnetometer/af7133/af7133.c @@ -19,7 +19,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c b/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c index 839c28326..37a6efc48 100644 --- a/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c +++ b/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c b/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c index 44135a39c..fcbb45f3a 100644 --- a/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c +++ b/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c b/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c index b4f64c5a6..a94b697c4 100644 --- a/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c +++ b/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c b/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c index 5e55b7811..01d2bffb7 100644 --- a/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c +++ b/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c b/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c index bab870222..09cb9e419 100644 --- a/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c +++ b/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c b/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c index e81accb0e..8a4298afd 100644 --- a/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c +++ b/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/ami304/ami304.c b/drivers/misc/mediatek/magnetometer/ami304/ami304.c index 26b4d928d..c936b9d74 100644 --- a/drivers/misc/mediatek/magnetometer/ami304/ami304.c +++ b/drivers/misc/mediatek/magnetometer/ami304/ami304.c @@ -19,7 +19,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c b/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c index c5d765eb7..6cc1cb3a8 100644 --- a/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c +++ b/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c @@ -19,7 +19,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c b/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c index 4c15f715a..aecd6b642 100644 --- a/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c +++ b/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c b/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c index d546b8474..95ac7ddcb 100644 --- a/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c +++ b/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c b/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c index 256d8270b..78ea20f14 100644 --- a/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c +++ b/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c b/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c index 91d2903f6..94828b257 100644 --- a/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c +++ b/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c b/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c index b639d973e..ee56f8475 100644 --- a/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c +++ b/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c @@ -19,7 +19,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c b/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c index e71dc05f1..76be4cd59 100644 --- a/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c +++ b/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c b/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c index 440263d80..63ada8f10 100644 --- a/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c +++ b/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/inc/mag_factory.h b/drivers/misc/mediatek/magnetometer/inc/mag_factory.h index 47e8da743..574092c22 100644 --- a/drivers/misc/mediatek/magnetometer/inc/mag_factory.h +++ b/drivers/misc/mediatek/magnetometer/inc/mag_factory.h @@ -6,7 +6,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c b/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c index 8c05026c4..aede23cbf 100644 --- a/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c +++ b/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c @@ -19,7 +19,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c b/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c index 9284e7a58..d3f018de7 100644 --- a/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c +++ b/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c @@ -20,7 +20,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c b/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c index 62b2b9a3b..aee823dd2 100644 --- a/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c +++ b/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c @@ -20,7 +20,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c b/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c index 37ac7adf8..d1274f2db 100644 --- a/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c +++ b/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c @@ -19,7 +19,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c b/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c index 3b2b0faff..9cf9eda3f 100644 --- a/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c +++ b/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c @@ -39,7 +39,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c b/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c index 739b7767b..6edcf140e 100644 --- a/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c +++ b/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c b/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c index 9f489deb9..bf8ddb031 100644 --- a/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c +++ b/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c @@ -39,7 +39,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c index 3d490edfc..e05ebdc64 100644 --- a/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c +++ b/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c index d562f0d1b..dc848a892 100644 --- a/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c +++ b/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c index 50a1dd90e..9961be4a7 100644 --- a/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c +++ b/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c b/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c index 64f26a457..784120a2f 100644 --- a/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c +++ b/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c b/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c index 289b55ed7..814e63885 100644 --- a/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c +++ b/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/s62x/s62x.c b/drivers/misc/mediatek/magnetometer/s62x/s62x.c index 6379791a3..7e6ac149a 100644 --- a/drivers/misc/mediatek/magnetometer/s62x/s62x.c +++ b/drivers/misc/mediatek/magnetometer/s62x/s62x.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/st480/st480.h b/drivers/misc/mediatek/magnetometer/st480/st480.h index 00d3f96cd..6f7c46efb 100644 --- a/drivers/misc/mediatek/magnetometer/st480/st480.h +++ b/drivers/misc/mediatek/magnetometer/st480/st480.h @@ -9,7 +9,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <linux/delay.h> #include <linux/input.h> diff --git a/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h b/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h index 847762300..33bd23d9b 100644 --- a/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h +++ b/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h @@ -50,7 +50,7 @@ #ifdef __LINUX_KERNEL_DRIVER__ #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kernel.h> #include <linux/slab.h> diff --git a/drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c b/drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c index 217c39e5d..85c80833c 100644 --- a/drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c +++ b/drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c @@ -6,7 +6,7 @@ * INCLUDE LINUX HEADER ******************************************************************************/ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ioctl.h> /****************************************************************************** diff --git a/drivers/misc/mediatek/masp/asfv2/core/sec_osal.c b/drivers/misc/mediatek/masp/asfv2/core/sec_osal.c index 1ebbd60d0..1300baa0f 100644 --- a/drivers/misc/mediatek/masp/asfv2/core/sec_osal.c +++ b/drivers/misc/mediatek/masp/asfv2/core/sec_osal.c @@ -12,7 +12,7 @@ #include <linux/mutex.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/version.h> #include <linux/module.h> diff --git a/drivers/misc/mediatek/masp/asfv2/module/sec_mod.c b/drivers/misc/mediatek/masp/asfv2/module/sec_mod.c index ec99a9e36..833d86b13 100644 --- a/drivers/misc/mediatek/masp/asfv2/module/sec_mod.c +++ b/drivers/misc/mediatek/masp/asfv2/module/sec_mod.c @@ -23,7 +23,7 @@ #include <linux/unistd.h> #include <linux/sched.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/version.h> #include <linux/spinlock.h> #include <linux/semaphore.h> diff --git a/drivers/misc/mediatek/masp/mt6735/module/sec_mod.c b/drivers/misc/mediatek/masp/mt6735/module/sec_mod.c index 134e0a786..7cf9fa73b 100644 --- a/drivers/misc/mediatek/masp/mt6735/module/sec_mod.c +++ b/drivers/misc/mediatek/masp/mt6735/module/sec_mod.c @@ -23,7 +23,7 @@ #include <linux/unistd.h> #include <linux/sched.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/version.h> #include <linux/spinlock.h> #include <linux/semaphore.h> diff --git a/drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c b/drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c index 476df0ce8..8f4c5fbd6 100644 --- a/drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c +++ b/drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c @@ -9,7 +9,7 @@ #include <linux/xlog.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/earlysuspend.h> diff --git a/drivers/misc/mediatek/mlog/mlog_logger.c b/drivers/misc/mediatek/mlog/mlog_logger.c index 4fea58343..24a4333cd 100644 --- a/drivers/misc/mediatek/mlog/mlog_logger.c +++ b/drivers/misc/mediatek/mlog/mlog_logger.c @@ -13,7 +13,7 @@ #include <linux/cred.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/version.h> #define COLLECT_GPU_MEMINFO diff --git a/drivers/misc/mediatek/mmc-host/emmc_rpmb.c b/drivers/misc/mediatek/mmc-host/emmc_rpmb.c index 229ea8e51..a14623def 100644 --- a/drivers/misc/mediatek/mmc-host/emmc_rpmb.c +++ b/drivers/misc/mediatek/mmc-host/emmc_rpmb.c @@ -7,7 +7,7 @@ #include <linux/unistd.h> #include <linux/sched.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/version.h> #include <linux/spinlock.h> #include <linux/semaphore.h> diff --git a/drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c b/drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c index 264e39722..c36413573 100644 --- a/drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c +++ b/drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c @@ -21,7 +21,7 @@ #include <linux/proc_fs.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mt_sd.h" #include "emmc_otp.h" diff --git a/drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c b/drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c index c388eaa1c..bfea1eca4 100644 --- a/drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c +++ b/drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c @@ -34,7 +34,7 @@ #include <linux/proc_fs.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_MTK_EMMC_SUPPORT /* extern struct excel_info PartInfoEmmc[PART_NUM]; */ diff --git a/drivers/misc/mediatek/mmp/dummy/mmprofile.c b/drivers/misc/mediatek/mmp/dummy/mmprofile.c index effe60d1c..0115b0bf5 100644 --- a/drivers/misc/mediatek/mmp/dummy/mmprofile.c +++ b/drivers/misc/mediatek/mmp/dummy/mmprofile.c @@ -10,7 +10,7 @@ #include <linux/device.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> //#include <asm/mach-types.h> #define MMPROFILE_INTERNAL diff --git a/drivers/misc/mediatek/mtprof/auto_tune.c b/drivers/misc/mediatek/mtprof/auto_tune.c index d87c4c981..40e138e8f 100644 --- a/drivers/misc/mediatek/mtprof/auto_tune.c +++ b/drivers/misc/mediatek/mtprof/auto_tune.c @@ -3,7 +3,7 @@ #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/stacktrace.h> #include <asm/stacktrace.h> diff --git a/drivers/misc/mediatek/mtprof/bootprof.c b/drivers/misc/mediatek/mtprof/bootprof.c index 81391131c..98ad13648 100644 --- a/drivers/misc/mediatek/mtprof/bootprof.c +++ b/drivers/misc/mediatek/mtprof/bootprof.c @@ -5,7 +5,7 @@ #include <linux/utsname.h> #include <linux/module.h> #include <linux/moduleparam.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define SEQ_printf(m, x...) \ do { \ diff --git a/drivers/misc/mediatek/mtprof/lockprof.c b/drivers/misc/mediatek/mtprof/lockprof.c index 40dce891a..51d3e5eb2 100644 --- a/drivers/misc/mediatek/mtprof/lockprof.c +++ b/drivers/misc/mediatek/mtprof/lockprof.c @@ -3,7 +3,7 @@ #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/stacktrace.h> #include <asm/stacktrace.h> diff --git a/drivers/misc/mediatek/mtprof/monitor_debug_out.c b/drivers/misc/mediatek/mtprof/monitor_debug_out.c index 1a1783349..af6821b83 100644 --- a/drivers/misc/mediatek/mtprof/monitor_debug_out.c +++ b/drivers/misc/mediatek/mtprof/monitor_debug_out.c @@ -3,7 +3,7 @@ #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "prof_ctl.h" #include <linux/module.h> #include <linux/pid.h> diff --git a/drivers/misc/mediatek/mtprof/mt_debug_config.c b/drivers/misc/mediatek/mtprof/mt_debug_config.c index e643428e0..2280336b1 100644 --- a/drivers/misc/mediatek/mtprof/mt_debug_config.c +++ b/drivers/misc/mediatek/mtprof/mt_debug_config.c @@ -3,7 +3,7 @@ #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "prof_ctl.h" #include <linux/module.h> #include <linux/pid.h> diff --git a/drivers/misc/mediatek/mtprof/mt_printk_ctrl.c b/drivers/misc/mediatek/mtprof/mt_printk_ctrl.c index 086be7480..8e14e524c 100644 --- a/drivers/misc/mediatek/mtprof/mt_printk_ctrl.c +++ b/drivers/misc/mediatek/mtprof/mt_printk_ctrl.c @@ -3,7 +3,7 @@ #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "prof_ctl.h" #include <linux/module.h> #include <linux/pid.h> diff --git a/drivers/misc/mediatek/mtprof/mt_prv_lock.c b/drivers/misc/mediatek/mtprof/mt_prv_lock.c index 04f5322d1..4a49cd37d 100644 --- a/drivers/misc/mediatek/mtprof/mt_prv_lock.c +++ b/drivers/misc/mediatek/mtprof/mt_prv_lock.c @@ -3,7 +3,7 @@ #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/stacktrace.h> #include <asm/stacktrace.h> diff --git a/drivers/misc/mediatek/mtprof/prof_ctl.c b/drivers/misc/mediatek/mtprof/prof_ctl.c index eaf49e361..8bf3ddf77 100644 --- a/drivers/misc/mediatek/mtprof/prof_ctl.c +++ b/drivers/misc/mediatek/mtprof/prof_ctl.c @@ -6,7 +6,7 @@ #include <linux/utsname.h> #include <linux/jiffies.h> #include <linux/kernel_stat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/tick.h> #include "prof_main.h" #include <linux/version.h> diff --git a/drivers/misc/mediatek/mtprof/prof_main.c b/drivers/misc/mediatek/mtprof/prof_main.c index db9910d49..b449d9460 100644 --- a/drivers/misc/mediatek/mtprof/prof_main.c +++ b/drivers/misc/mediatek/mtprof/prof_main.c @@ -4,7 +4,7 @@ #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sched.h> #include <linux/mt_wq_debug.h> #include <linux/xlog.h> diff --git a/drivers/misc/mediatek/mtprof/sched_monitor.c b/drivers/misc/mediatek/mtprof/sched_monitor.c index e0b8abee9..9215c051c 100644 --- a/drivers/misc/mediatek/mtprof/sched_monitor.c +++ b/drivers/misc/mediatek/mtprof/sched_monitor.c @@ -4,7 +4,7 @@ #include <linux/kallsyms.h> #include <linux/utsname.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "prof_ctl.h" #include <linux/module.h> #include <linux/pid.h> diff --git a/drivers/misc/mediatek/mu3d/drv/musb_core.c b/drivers/misc/mediatek/mu3d/drv/musb_core.c index fb0f87355..dc6b42c3c 100644 --- a/drivers/misc/mediatek/mu3d/drv/musb_core.c +++ b/drivers/misc/mediatek/mu3d/drv/musb_core.c @@ -102,7 +102,7 @@ #ifdef CONFIG_USBIF_COMPLIANCE #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/seq_file.h> #include <mach/system.h> #endif diff --git a/drivers/misc/mediatek/mu3d/drv/musb_debugfs.c b/drivers/misc/mediatek/mu3d/drv/musb_debugfs.c index 40894e4bf..16a28e917 100644 --- a/drivers/misc/mediatek/mu3d/drv/musb_debugfs.c +++ b/drivers/misc/mediatek/mu3d/drv/musb_debugfs.c @@ -37,7 +37,7 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "musb_core.h" #include "musb_debug.h" diff --git a/drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c b/drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c index b1d737f38..cee03d126 100644 --- a/drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c +++ b/drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c @@ -19,7 +19,7 @@ #include <linux/scatterlist.h> #include <asm/unaligned.h> #include <linux/usb/ch9.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mu3d/test_drv/mu3d_test_test.h> #include <linux/mu3d/test_drv/mu3d_test_unified.h> diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h index 584b343ae..f7aeaeee7 100644 --- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h +++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h @@ -15,7 +15,7 @@ #include <linux/rtpm_prio.h> #include <linux/vmalloc.h> #include <linux/disp_assert_layer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h index 6fb490290..62f88a345 100644 --- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h +++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h @@ -15,7 +15,7 @@ #include <linux/vmalloc.h> #include <linux/disp_assert_layer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h index 8a77666e5..8651abe17 100644 --- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h +++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h @@ -16,7 +16,7 @@ #include <linux/vmalloc.h> #include <linux/disp_assert_layer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c index 227860e44..68055c9c7 100644 --- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c +++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c @@ -15,7 +15,7 @@ #include <linux/platform_device.h> #include <linux/earlysuspend.h> #include <linux/cdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_gpio.h> #include <linux/delay.h> diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c index e0580c74f..62b76f968 100644 --- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c +++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c @@ -16,7 +16,7 @@ #include <linux/vmalloc.h> #include <linux/disp_assert_layer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> @@ -33,7 +33,7 @@ #include <asm/tlbflush.h> #include <asm/page.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <generated/autoconf.h> @@ -49,7 +49,7 @@ #include <linux/kthread.h> #include <linux/rtpm_prio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> @@ -58,7 +58,7 @@ #include <mach/irqs.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mt8193_pinmux.h" #include "mt8193_gpio.h" diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c index 93d87928d..68648426c 100644 --- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c +++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c @@ -34,7 +34,7 @@ #include <linux/vmalloc.h> #include <linux/disp_assert_layer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> @@ -51,7 +51,7 @@ #include <asm/tlbflush.h> #include <asm/page.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <generated/autoconf.h> @@ -67,7 +67,7 @@ #include <linux/kthread.h> #include <linux/rtpm_prio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> @@ -76,7 +76,7 @@ #include <mach/irqs.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mt8193_iic.h" #include "cust_mt8193.h" diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c index 01e417ade..316bc9c1c 100644 --- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c +++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c @@ -16,7 +16,7 @@ #include <linux/vmalloc.h> #include <linux/disp_assert_layer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> @@ -33,7 +33,7 @@ #include <asm/tlbflush.h> #include <asm/page.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <generated/autoconf.h> @@ -49,7 +49,7 @@ #include <linux/kthread.h> #include <linux/rtpm_prio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/io.h> @@ -58,7 +58,7 @@ #include <mach/irqs.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mt8193_pinmux.h" #include "mt8193.h" diff --git a/drivers/misc/mediatek/nand/mt6735/mtk_nand.c b/drivers/misc/mediatek/nand/mt6735/mtk_nand.c index fa5996bb0..fc7f65b0d 100644 --- a/drivers/misc/mediatek/nand/mt6735/mtk_nand.c +++ b/drivers/misc/mediatek/nand/mt6735/mtk_nand.c @@ -34,7 +34,7 @@ #include <linux/mm.h> #include <asm/io.h> #include <asm/cacheflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/miscdevice.h> #include <mach/mtk_nand.h> #include <mach/dma.h> diff --git a/drivers/misc/mediatek/nand/mt6735/partition_mt.c b/drivers/misc/mediatek/nand/mt6735/partition_mt.c index 2657c5f3f..6f21b0a75 100644 --- a/drivers/misc/mediatek/nand/mt6735/partition_mt.c +++ b/drivers/misc/mediatek/nand/mt6735/partition_mt.c @@ -33,7 +33,7 @@ #include <asm/io.h> #include <asm/cacheflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_typedefs.h> #include <mach/mt_clkmgr.h> diff --git a/drivers/misc/mediatek/pa/pa.c b/drivers/misc/mediatek/pa/pa.c index beb3c2fb0..f3b5c9ddc 100644 --- a/drivers/misc/mediatek/pa/pa.c +++ b/drivers/misc/mediatek/pa/pa.c @@ -9,7 +9,7 @@ #include <linux/sysfs.h> #include <linux/device.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cputime.h> #include <linux/tick.h> #include <linux/kernel_stat.h> diff --git a/drivers/misc/mediatek/pa_hmp/pa.c b/drivers/misc/mediatek/pa_hmp/pa.c index 0c2052cf5..7bb055bdd 100644 --- a/drivers/misc/mediatek/pa_hmp/pa.c +++ b/drivers/misc/mediatek/pa_hmp/pa.c @@ -9,7 +9,7 @@ #include <linux/sysfs.h> #include <linux/device.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cputime.h> #include <linux/tick.h> #include <linux/kernel_stat.h> diff --git a/drivers/misc/mediatek/partition/mt6735/efi.c b/drivers/misc/mediatek/partition/mt6735/efi.c index fabec3489..b589c1466 100644 --- a/drivers/misc/mediatek/partition/mt6735/efi.c +++ b/drivers/misc/mediatek/partition/mt6735/efi.c @@ -3,7 +3,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/crc32.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mmc/sd_misc.h> diff --git a/drivers/misc/mediatek/partition/mt6735/partition.c b/drivers/misc/mediatek/partition/mt6735/partition.c index 2f99b44c1..d43ed3969 100644 --- a/drivers/misc/mediatek/partition/mt6735/partition.c +++ b/drivers/misc/mediatek/partition/mt6735/partition.c @@ -2,7 +2,7 @@ #include <linux/genhd.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mmc/sd_misc.h> diff --git a/drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c b/drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c index 934f5220b..63d611f44 100644 --- a/drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c +++ b/drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c @@ -8,7 +8,7 @@ #include <linux/device.h> #include <linux/cdev.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> //Add for msleep #include <linux/seq_file.h> #include <mach/wd_api.h> diff --git a/drivers/misc/mediatek/power/mt6735/bq24261.c b/drivers/misc/mediatek/power/mt6735/bq24261.c index d74f204f3..7c9b7ab21 100644 --- a/drivers/misc/mediatek/power/mt6735/bq24261.c +++ b/drivers/misc/mediatek/power/mt6735/bq24261.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/power/mt6735/bq24296.c b/drivers/misc/mediatek/power/mt6735/bq24296.c index 7e19890b4..3062a9450 100644 --- a/drivers/misc/mediatek/power/mt6735/bq24296.c +++ b/drivers/misc/mediatek/power/mt6735/bq24296.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/power/mt6735/fan5405.c b/drivers/misc/mediatek/power/mt6735/fan5405.c index 1ee31d819..3f25308c5 100644 --- a/drivers/misc/mediatek/power/mt6735/fan5405.c +++ b/drivers/misc/mediatek/power/mt6735/fan5405.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/power/mt6735/max77819_pmic.c b/drivers/misc/mediatek/power/mt6735/max77819_pmic.c index 04622d594..ae201ac90 100644 --- a/drivers/misc/mediatek/power/mt6735/max77819_pmic.c +++ b/drivers/misc/mediatek/power/mt6735/max77819_pmic.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/power/mt6735/mt6311.c b/drivers/misc/mediatek/power/mt6735/mt6311.c index e0af604f0..fc5e22723 100644 --- a/drivers/misc/mediatek/power/mt6735/mt6311.c +++ b/drivers/misc/mediatek/power/mt6735/mt6311.c @@ -16,7 +16,7 @@ #include <linux/kthread.h> #include <linux/wakelock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/power/mt6735/ncp1854.c b/drivers/misc/mediatek/power/mt6735/ncp1854.c index 333e8609c..d7938d99e 100644 --- a/drivers/misc/mediatek/power/mt6735/ncp1854.c +++ b/drivers/misc/mediatek/power/mt6735/ncp1854.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/power/mt6735/pmic.c b/drivers/misc/mediatek/power/mt6735/pmic.c index f6ea19c79..efdeac0f3 100644 --- a/drivers/misc/mediatek/power/mt6735/pmic.c +++ b/drivers/misc/mediatek/power/mt6735/pmic.c @@ -46,7 +46,7 @@ #include <linux/of_fdt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> diff --git a/drivers/misc/mediatek/power/mt6735/pmic_auxadc.c b/drivers/misc/mediatek/power/mt6735/pmic_auxadc.c index 4b60f17db..125868cfb 100644 --- a/drivers/misc/mediatek/power/mt6735/pmic_auxadc.c +++ b/drivers/misc/mediatek/power/mt6735/pmic_auxadc.c @@ -25,7 +25,7 @@ #include <linux/earlysuspend.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/upmu_common.h> #include <mach/upmu_sw.h> diff --git a/drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c b/drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c index 165022068..44c41af17 100644 --- a/drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c +++ b/drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c @@ -25,7 +25,7 @@ #include <linux/earlysuspend.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/upmu_common.h> #include <mach/upmu_sw.h> diff --git a/drivers/misc/mediatek/power/mt6735/pmic_dvt.c b/drivers/misc/mediatek/power/mt6735/pmic_dvt.c index 0c0a7babc..cda169490 100644 --- a/drivers/misc/mediatek/power/mt6735/pmic_dvt.c +++ b/drivers/misc/mediatek/power/mt6735/pmic_dvt.c @@ -26,7 +26,7 @@ #include <linux/seq_file.h> #include <linux/time.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/upmu_common.h> #include <mach/upmu_sw.h> diff --git a/drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c b/drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c index 4c32ba907..41082dbcd 100644 --- a/drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c +++ b/drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c @@ -25,7 +25,7 @@ #include <linux/earlysuspend.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/upmu_common.h> #include <mach/upmu_sw.h> diff --git a/drivers/misc/mediatek/power/mt6735/tps6128x.c b/drivers/misc/mediatek/power/mt6735/tps6128x.c index 726608217..3824fa9b6 100644 --- a/drivers/misc/mediatek/power/mt6735/tps6128x.c +++ b/drivers/misc/mediatek/power/mt6735/tps6128x.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c b/drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c index c47f58f41..c10cfb1c7 100644 --- a/drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c +++ b/drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c @@ -23,7 +23,7 @@ #include <linux/types.h> #include <linux/delay.h> #include <asm/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <mach/mt_pwm_hal_pub.h> diff --git a/drivers/misc/mediatek/pwm/mt_pwm.c b/drivers/misc/mediatek/pwm/mt_pwm.c index 99d4abfd3..3d51ae5ed 100644 --- a/drivers/misc/mediatek/pwm/mt_pwm.c +++ b/drivers/misc/mediatek/pwm/mt_pwm.c @@ -34,7 +34,7 @@ #include <linux/cdev.h> #include <linux/miscdevice.h> #include <asm/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #ifdef CONFIG_OF #include <linux/of.h> diff --git a/drivers/misc/mediatek/secmem/mt6735/secmem.c b/drivers/misc/mediatek/secmem/mt6735/secmem.c index ab31c793f..51b9aa685 100644 --- a/drivers/misc/mediatek/secmem/mt6735/secmem.c +++ b/drivers/misc/mediatek/secmem/mt6735/secmem.c @@ -7,7 +7,7 @@ #include <linux/unistd.h> #include <linux/sched.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/version.h> #include <linux/spinlock.h> #include <linux/semaphore.h> diff --git a/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c b/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c index b840304d9..cb1221e3e 100644 --- a/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c +++ b/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c @@ -7,7 +7,7 @@ #include <linux/unistd.h> #include <linux/sched.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/version.h> #include <linux/spinlock.h> #include <linux/semaphore.h> diff --git a/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c b/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c index 4e7cf21c4..841478254 100644 --- a/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c +++ b/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c @@ -3,7 +3,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c b/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c index 3ef1c786f..91ac290af 100644 --- a/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c +++ b/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c @@ -11,7 +11,7 @@ #include <linux/slab.h> #include <linux/irq.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/input.h> #include <linux/workqueue.h> diff --git a/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c b/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c index 66c9b176f..af09897d2 100644 --- a/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c +++ b/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c @@ -1,5 +1,5 @@ #include <asm/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <cust_acc.h> diff --git a/drivers/misc/mediatek/ssw/inc/ssw.h b/drivers/misc/mediatek/ssw/inc/ssw.h index 07bb1e7aa..17ec0a617 100644 --- a/drivers/misc/mediatek/ssw/inc/ssw.h +++ b/drivers/misc/mediatek/ssw/inc/ssw.h @@ -13,7 +13,7 @@ #include <linux/ctype.h> #include <linux/cdev.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/sysenv/mt6735/sysenv.c b/drivers/misc/mediatek/sysenv/mt6735/sysenv.c index 083270101..66be68438 100644 --- a/drivers/misc/mediatek/sysenv/mt6735/sysenv.c +++ b/drivers/misc/mediatek/sysenv/mt6735/sysenv.c @@ -6,7 +6,7 @@ #include <linux/proc_fs.h> /*proc_create API*/ #include <linux/statfs.h> /* kstatfs struct */ #include <linux/file.h> /*kernel write and kernel read*/ -#include <asm/uaccess.h> /*copy_to_user copy_from_user */ +#include <linux/uaccess.h> /*copy_to_user copy_from_user */ #include <mach/env.h> static char env_get_char(int index); diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c index b27329601..c5e51439c 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c @@ -4,7 +4,7 @@ #include <linux/types.h> #include <linux/kobject.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include <linux/timer.h> diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c index 4f7b628a7..dfe91ddc5 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/kobject.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include <linux/timer.h> diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c index b6967f716..67f14c97c 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c @@ -4,7 +4,7 @@ #include <linux/types.h> #include <linux/kobject.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include <linux/timer.h> diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c index 487abdaf6..43d35d067 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c @@ -5,7 +5,7 @@ #include <linux/kobject.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include "mach/mtk_thermal_monitor.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c index 1727cddc4..d415fb664 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/kobject.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include "mach/mtk_thermal_monitor.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c index 88ced86a4..5a613a615 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/kobject.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include "mach/mtk_thermal_monitor.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c index cdd15cc0b..62e288cc5 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/kobject.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include "mach/mtk_thermal_monitor.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c index fbfe3d9a3..d4fa8b46d 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/kobject.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include <linux/timer.h> diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c index 4eae0d7dd..e9447bfb7 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c @@ -4,7 +4,7 @@ #include <linux/types.h> #include <linux/kobject.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include "mach/mtk_thermal_monitor.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c b/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c index fd28b02eb..93174bd9c 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c @@ -1,4 +1,4 @@ -#include <asm/uaccess.h> +#include <linux/uaccess.h> //#include <asm/system.h> #include <linux/kernel.h> diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c b/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c index 8ce3769a4..6fb9e03c8 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c @@ -1,4 +1,4 @@ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/dmi.h> diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c index 2de2e84bc..edba9bd80 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c @@ -12,7 +12,7 @@ #include <linux/syscalls.h> #include <linux/sched.h> #include <linux/writeback.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mach/mtk_thermal_monitor.h" #include "mach/mt_typedefs.h" #include "mach/mt_thermal.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c index d464f2080..e6388fabb 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c @@ -12,7 +12,7 @@ #include <linux/syscalls.h> #include <linux/sched.h> #include <linux/writeback.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mach/mtk_thermal_monitor.h" #include "mach/mt_typedefs.h" #include "mach/mt_thermal.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c index 941db2635..8d3012b56 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c @@ -12,7 +12,7 @@ #include <linux/syscalls.h> #include <linux/sched.h> #include <linux/writeback.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mach/mtk_thermal_monitor.h" #include "mach/mt_typedefs.h" #include "mach/mt_thermal.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c index ba769a4af..f39a2973d 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c @@ -12,7 +12,7 @@ #include <linux/syscalls.h> #include <linux/sched.h> #include <linux/writeback.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/string.h> #include <linux/spinlock.h> #include "mach/mtk_thermal_monitor.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c index 6ea5393ef..96a4087e0 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c @@ -13,7 +13,7 @@ #include <linux/syscalls.h> #include <linux/sched.h> #include <linux/writeback.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/string.h> #include <linux/spinlock.h> #include "mach/mtk_thermal_monitor.h" diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c index bc9f20a5b..d61298545 100644 --- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c +++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c @@ -2,7 +2,7 @@ #include <linux/thermal.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> //#include "wmt_tm.h" #include <mach/mtk_thermal_monitor.h> #include <linux/timer.h> diff --git a/drivers/misc/mediatek/thermal/mt6735/tm_nth.c b/drivers/misc/mediatek/thermal/mt6735/tm_nth.c index d9fa1e3a9..cc4f3b3af 100644 --- a/drivers/misc/mediatek/thermal/mt6735/tm_nth.c +++ b/drivers/misc/mediatek/thermal/mt6735/tm_nth.c @@ -5,7 +5,7 @@ #include <linux/kobject.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/err.h> #include <linux/syscalls.h> #include "mach/mt_thermal.h" diff --git a/drivers/misc/mediatek/thermal/mtk_cooler_cam.c b/drivers/misc/mediatek/thermal/mtk_cooler_cam.c index f51c42beb..f7833bb75 100644 --- a/drivers/misc/mediatek/thermal/mtk_cooler_cam.c +++ b/drivers/misc/mediatek/thermal/mtk_cooler_cam.c @@ -13,7 +13,7 @@ #include <linux/kobject.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mach/mtk_thermal_monitor.h" diff --git a/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c b/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c index 0a3a474a8..caff4e4ab 100644 --- a/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c +++ b/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c @@ -20,7 +20,7 @@ #include <linux/version.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/pid.h> #include <linux/signal.h> #include <linux/sched.h> diff --git a/drivers/misc/mediatek/thermal/mtk_cooler_vrt.c b/drivers/misc/mediatek/thermal/mtk_cooler_vrt.c index 2b055341b..caccf4313 100644 --- a/drivers/misc/mediatek/thermal/mtk_cooler_vrt.c +++ b/drivers/misc/mediatek/thermal/mtk_cooler_vrt.c @@ -11,7 +11,7 @@ #include <linux/kobject.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mach/mtk_thermal_monitor.h" #define MAX_NUM_INSTANCE_MTK_COOLER_VRT 1 diff --git a/drivers/misc/mediatek/thermal/mtk_thermal_monitor.c b/drivers/misc/mediatek/thermal/mtk_thermal_monitor.c index c0081badf..09462c598 100644 --- a/drivers/misc/mediatek/thermal/mtk_thermal_monitor.c +++ b/drivers/misc/mediatek/thermal/mtk_thermal_monitor.c @@ -3,7 +3,7 @@ #endif #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/version.h> #include <linux/kernel.h> #include <linux/printk.h> diff --git a/drivers/misc/mediatek/trustzone/tz_fileio.c b/drivers/misc/mediatek/trustzone/tz_fileio.c index ea4816961..4e813543f 100644 --- a/drivers/misc/mediatek/trustzone/tz_fileio.c +++ b/drivers/misc/mediatek/trustzone/tz_fileio.c @@ -3,7 +3,7 @@ #include <linux/fs.h> #include <asm/segment.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/buffer_head.h> #include "tz_fileio.h" diff --git a/drivers/misc/mediatek/trustzone/tz_fileio.h b/drivers/misc/mediatek/trustzone/tz_fileio.h index b4d83f4eb..07cd48611 100644 --- a/drivers/misc/mediatek/trustzone/tz_fileio.h +++ b/drivers/misc/mediatek/trustzone/tz_fileio.h @@ -2,7 +2,7 @@ #define DRIVER_FILE_PR_IO_H #include <linux/fs.h> #include <asm/segment.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/buffer_head.h> #define UINT64 unsigned long long #define INT64 long long diff --git a/drivers/misc/mediatek/uibc/uibc.c b/drivers/misc/mediatek/uibc/uibc.c index 9f4b28116..a7dea847f 100644 --- a/drivers/misc/mediatek/uibc/uibc.c +++ b/drivers/misc/mediatek/uibc/uibc.c @@ -16,7 +16,7 @@ #include <linux/device.h> #include <linux/errno.h> #include <asm/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/input/mt.h> #include <linux/version.h> #include <linux/slab.h> diff --git a/drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c b/drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c index 7f7499ed0..6b16da0a1 100644 --- a/drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c +++ b/drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c @@ -36,7 +36,7 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "musbfsh_core.h" #include "musbfsh_host.h" diff --git a/drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c b/drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c index f40861de7..0e7932d66 100644 --- a/drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c +++ b/drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c @@ -43,7 +43,7 @@ #include <linux/io.h> //#include <asm/system.h> #include <linux/miscdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/completion.h> #include <mach/eint.h> #include <linux/gpio.h> diff --git a/drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c b/drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c index bba0fefd0..187ac114c 100644 --- a/drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c +++ b/drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c @@ -3,7 +3,7 @@ #include <linux/init.h> #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/musb/musb_core.h> #include <linux/musb/musb_debug.h> #include <linux/musb/mtk_musb.h> diff --git a/drivers/misc/mediatek/usb20/musb_debugfs.c b/drivers/misc/mediatek/usb20/musb_debugfs.c index a4b5077e1..4baa79d1b 100644 --- a/drivers/misc/mediatek/usb20/musb_debugfs.c +++ b/drivers/misc/mediatek/usb20/musb_debugfs.c @@ -37,7 +37,7 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/musb/musb_core.h> #include <linux/musb/musb_debug.h> diff --git a/drivers/misc/mediatek/vdec/vdec.c b/drivers/misc/mediatek/vdec/vdec.c index ffd5070f6..74539e9d2 100644 --- a/drivers/misc/mediatek/vdec/vdec.c +++ b/drivers/misc/mediatek/vdec/vdec.c @@ -12,7 +12,7 @@ #include <linux/cdev.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "verify/vdec_verify_vdec.h" #include <linux/kthread.h> #include <linux/sched.h> diff --git a/drivers/misc/mediatek/vdec/verify/sata_fs_io.c b/drivers/misc/mediatek/vdec/verify/sata_fs_io.c index 6f47a4b18..9045c03b7 100644 --- a/drivers/misc/mediatek/vdec/verify/sata_fs_io.c +++ b/drivers/misc/mediatek/vdec/verify/sata_fs_io.c @@ -16,7 +16,7 @@ #include <linux/kdev_t.h> #include <linux/cdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sched.h> #include <linux/file.h> #include <linux/slab.h> diff --git a/drivers/misc/mediatek/vdec/verify/usb_io.c b/drivers/misc/mediatek/vdec/verify/usb_io.c index f6f0b2d6c..a07eb0a70 100644 --- a/drivers/misc/mediatek/vdec/verify/usb_io.c +++ b/drivers/misc/mediatek/vdec/verify/usb_io.c @@ -16,7 +16,7 @@ #include <linux/kdev_t.h> #include <linux/cdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sched.h> #include <linux/file.h> #include <linux/slab.h> diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c index b048e2dd9..abcbb0596 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c @@ -6,7 +6,7 @@ #include <linux/mm.h> #include <linux/slab.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kernel.h> //#include "common.h" diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c index c4e79887e..e3a0b02d6 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c @@ -57,7 +57,7 @@ #include <linux/kdev_t.h> #include <linux/cdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sched.h> #include <linux/file.h> #include <linux/slab.h> diff --git a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c index 0813badb2..a3d95a9d8 100644 --- a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c +++ b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c @@ -12,7 +12,7 @@ #include <linux/mm.h> #include <linux/jiffies.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <linux/vmalloc.h> #include <linux/interrupt.h> diff --git a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c index b78273ab4..7c038074c 100644 --- a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c +++ b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c @@ -12,7 +12,7 @@ #include <linux/mm.h> #include <linux/jiffies.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <linux/vmalloc.h> #include <linux/interrupt.h> diff --git a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c index 7f19f3016..d0f43e2b3 100644 --- a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c +++ b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c @@ -12,7 +12,7 @@ #include <linux/mm.h> #include <linux/jiffies.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <linux/vmalloc.h> #include <linux/interrupt.h> diff --git a/drivers/misc/mediatek/videox/mt6735/mtkfb.c b/drivers/misc/mediatek/videox/mt6735/mtkfb.c index 2672a30f8..e7e0e6b4d 100644 --- a/drivers/misc/mediatek/videox/mt6735/mtkfb.c +++ b/drivers/misc/mediatek/videox/mt6735/mtkfb.c @@ -20,7 +20,7 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/dma-buf.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> //#include <asm/mach-types.h> #include <asm/cacheflush.h> diff --git a/drivers/misc/mediatek/vow/mt6735/vow.c b/drivers/misc/mediatek/vow/mt6735/vow.c index 3d09f602b..b789ce73b 100644 --- a/drivers/misc/mediatek/vow/mt6735/vow.c +++ b/drivers/misc/mediatek/vow/mt6735/vow.c @@ -43,7 +43,7 @@ #include <linux/mm.h> #include <linux/jiffies.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <linux/vmalloc.h> #include <linux/interrupt.h> diff --git a/drivers/misc/mediatek/wdk/wdt_test.c b/drivers/misc/mediatek/wdk/wdt_test.c index 7797f71f9..09315b62e 100644 --- a/drivers/misc/mediatek/wdk/wdt_test.c +++ b/drivers/misc/mediatek/wdk/wdt_test.c @@ -33,7 +33,7 @@ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/irqs.h> #include <mach/mt_reg_base.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c b/drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c index bd2d8166c..c392c3d7d 100644 --- a/drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c +++ b/drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c @@ -9,7 +9,7 @@ #include <linux/watchdog.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/irqs.h> #include <mach/mt_reg_base.h> #include <mach/mt_typedefs.h> diff --git a/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h b/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h index 70ec83575..95c6e991a 100644 --- a/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h +++ b/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h @@ -12,7 +12,7 @@ #include <linux/sched.h> #include <linux/poll.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/wait.h> #include <linux/time.h> #include <linux/delay.h> diff --git a/drivers/misc/mediatek/xhci/xhci-mtk.c b/drivers/misc/mediatek/xhci/xhci-mtk.c index 126dbf83b..dc7c54f9f 100644 --- a/drivers/misc/mediatek/xhci/xhci-mtk.c +++ b/drivers/misc/mediatek/xhci/xhci-mtk.c @@ -5,7 +5,7 @@ #include <linux/kernel.h> /* printk() */ #include <linux/slab.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/wakelock.h> diff --git a/drivers/misc/mediatek/xhci_test/mtk-test.c b/drivers/misc/mediatek/xhci_test/mtk-test.c index 3230ab54b..e12960594 100644 --- a/drivers/misc/mediatek/xhci_test/mtk-test.c +++ b/drivers/misc/mediatek/xhci_test/mtk-test.c @@ -19,7 +19,7 @@ #include <linux/scatterlist.h> #include <asm/unaligned.h> #include <linux/usb/ch9.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mtk-test.h" #include "xhci.h" #include "mtk-usb-hcd.h" diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 164f68a05..a8e178c5c 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -48,7 +48,7 @@ #include <linux/mmc/ffu.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "queue.h" #include <mach/mtk_meminfo.h> diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c index 7780c1470..35d5f366e 100644 --- a/drivers/mmc/host/android-goldfish.c +++ b/drivers/mmc/host/android-goldfish.c @@ -49,7 +49,7 @@ #include <asm/types.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DRIVER_NAME "goldfish_mmc" diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c index 0c51b988e..698a227d4 100644 --- a/drivers/mtd/devices/pmc551.c +++ b/drivers/mtd/devices/pmc551.c @@ -82,7 +82,7 @@ #include <linux/kernel.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/types.h> #include <linux/init.h> #include <linux/ptrace.h> diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c index 5a5cd2ace..9ff8a74c2 100644 --- a/drivers/mtd/devices/slram.c +++ b/drivers/mtd/devices/slram.c @@ -30,7 +30,7 @@ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/ptrace.h> diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c index 71e4f6cca..366aa0e6b 100644 --- a/drivers/mtd/ftl.c +++ b/drivers/mtd/ftl.c @@ -70,7 +70,7 @@ #include <linux/hdreg.h> #include <linux/vmalloc.h> #include <linux/blkpg.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mtd/ftl.h> diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c index 3af351484..5786c8d5e 100644 --- a/drivers/mtd/inftlcore.c +++ b/drivers/mtd/inftlcore.c @@ -34,7 +34,7 @@ #include <linux/mtd/nftl.h> #include <linux/mtd/inftl.h> #include <linux/mtd/nand.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/errno.h> #include <asm/io.h> diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c index 4adc0374f..c0d2a8682 100644 --- a/drivers/mtd/inftlmount.c +++ b/drivers/mtd/inftlmount.c @@ -27,7 +27,7 @@ #include <linux/module.h> #include <asm/errno.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/slab.h> #include <linux/init.h> diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c index d467f3b11..07892409c 100644 --- a/drivers/mtd/maps/sun_uflash.c +++ b/drivers/mtd/maps/sun_uflash.c @@ -17,7 +17,7 @@ #include <linux/of_device.h> #include <linux/slab.h> #include <asm/prom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/mtd/mtd.h> diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 8588fe6cc..eb1fd3c35 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -32,7 +32,7 @@ #include <linux/hdreg.h> #include <linux/init.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mtdcore.h" diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index c71987928..56c30cf1a 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -36,7 +36,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/map.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mtdcore.h" diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 689db3435..e24e48c41 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -36,7 +36,7 @@ #define DYNAMIC_CHANGE_MTD_WRITEABLE #ifdef DYNAMIC_CHANGE_MTD_WRITEABLE //wschen 2011-01-05 #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static struct mtd_info *my_mtd = NULL; int mtd_writeable_proc_write(struct file *file, const char *buffer, unsigned long count, void *data); diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c index c5f4ebf4b..783965931 100644 --- a/drivers/mtd/nftlcore.c +++ b/drivers/mtd/nftlcore.c @@ -25,7 +25,7 @@ #include <linux/module.h> #include <asm/errno.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/slab.h> #include <linux/init.h> diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 10d0dba57..73f9107b2 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c @@ -33,7 +33,7 @@ #include <linux/if_arp.h> #include <linux/slab.h> #include <net/route.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ipddp.h" /* Our stuff */ diff --git a/drivers/net/eql.c b/drivers/net/eql.c index f219d38ac..f0716d03d 100644 --- a/drivers/net/eql.c +++ b/drivers/net/eql.c @@ -127,7 +127,7 @@ #include <linux/if_eql.h> #include <linux/pkt_sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int eql_open(struct net_device *dev); static int eql_close(struct net_device *dev); diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c index adb4bf5eb..472be431c 100644 --- a/drivers/net/ethernet/3com/3c509.c +++ b/drivers/net/ethernet/3com/3c509.c @@ -88,7 +88,7 @@ #include <linux/eisa.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c index 94c656f5a..1d6eb6b6e 100644 --- a/drivers/net/ethernet/3com/3c515.c +++ b/drivers/net/ethernet/3com/3c515.c @@ -72,7 +72,7 @@ static int max_interrupt_work = 20; #include <linux/ethtool.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/dma.h> diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c index 6fc994fa4..bda355dc1 100644 --- a/drivers/net/ethernet/3com/3c574_cs.c +++ b/drivers/net/ethernet/3com/3c574_cs.c @@ -93,7 +93,7 @@ earlier 3Com products. #include <pcmcia/ciscode.h> #include <pcmcia/ds.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /*====================================================================*/ diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c index 078480aaa..f285591b6 100644 --- a/drivers/net/ethernet/3com/3c589_cs.c +++ b/drivers/net/ethernet/3com/3c589_cs.c @@ -48,7 +48,7 @@ #include <pcmcia/ciscode.h> #include <pcmcia/ds.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /* To minimize the size of the driver source I only define operating diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 072c6f14e..c75fbae27 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c @@ -92,7 +92,7 @@ static int vortex_debug = 1; #include <linux/gfp.h> #include <asm/irq.h> /* For nr_irqs only. */ #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Kernel compatibility defines, some common to David Hinds' PCMCIA package. This is only in the support-all-kernels source code. */ diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 144942f63..5095cf4a2 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -119,7 +119,7 @@ static const int multicast_filter_limit = 32; #include <linux/bitops.h> #include <asm/processor.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/in6.h> #include <linux/dma-mapping.h> #include <linux/firmware.h> diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c index d801c1410..37538157f 100644 --- a/drivers/net/ethernet/8390/axnet_cs.c +++ b/drivers/net/ethernet/8390/axnet_cs.c @@ -47,7 +47,7 @@ #include <asm/io.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define AXNET_CMD 0x00 #define AXNET_DATAPORT 0x10 /* NatSemi-defined port window offset. */ diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c index 587a885de..bb2b92190 100644 --- a/drivers/net/ethernet/8390/ne2k-pci.c +++ b/drivers/net/ethernet/8390/ne2k-pci.c @@ -56,7 +56,7 @@ static int options[MAX_UNITS]; #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "8390.h" diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c index 46c5aadac..a82b1cede 100644 --- a/drivers/net/ethernet/8390/pcnet_cs.c +++ b/drivers/net/ethernet/8390/pcnet_cs.c @@ -50,7 +50,7 @@ #include <asm/io.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define PCNET_CMD 0x00 #define PCNET_DATAPORT 0x10 /* NatSemi-defined port window offset. */ diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index 8b04bfc20..4ff17c30b 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c @@ -45,7 +45,7 @@ #include <linux/mm.h> #include <linux/firmware.h> #include <asm/processor.h> /* Processor type for cache alignment. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /* diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c index b7894f8af..f0bfc56db 100644 --- a/drivers/net/ethernet/alteon/acenic.c +++ b/drivers/net/ethernet/alteon/acenic.c @@ -81,7 +81,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DRV_NAME "acenic" diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index 8e6b665a6..a75b38d32 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c @@ -90,7 +90,7 @@ Revision History: #include <asm/io.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #define AMD8111E_VLAN_TAG_USED 1 diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c index d4ed89130..1f775c7f2 100644 --- a/drivers/net/ethernet/amd/nmclan_cs.c +++ b/drivers/net/ethernet/amd/nmclan_cs.c @@ -152,7 +152,7 @@ Include Files #include <pcmcia/cistpl.h> #include <pcmcia/ds.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /* ---------------------------------------------------------------------------- diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 9b017d9c5..853399027 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c @@ -30,7 +30,7 @@ #include <linux/ssb/ssb.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c index 9624cfe7d..a2212a508 100644 --- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c +++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c @@ -46,7 +46,7 @@ #include <linux/mii.h> #include <linux/sockios.h> #include <linux/dma-mapping.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "cpl5_cmd.h" #include "regs.h" diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 71497e835..f428602e7 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -50,7 +50,7 @@ #include <linux/stringify.h> #include <linux/sched.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "common.h" #include "cxgb3_ioctl.h" diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 3cd397d60..776c4c3b5 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -60,7 +60,7 @@ #include <linux/workqueue.h> #include <net/neighbour.h> #include <net/netevent.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "cxgb4.h" #include "t4_regs.h" diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c index eaab73cf2..43725d91a 100644 --- a/drivers/net/ethernet/dec/tulip/de2104x.c +++ b/drivers/net/ethernet/dec/tulip/de2104x.c @@ -49,7 +49,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> /* These identify the driver base version and may not be removed. */ diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index 4c830030f..f7f12ddad 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c @@ -472,7 +472,7 @@ #include <asm/dma.h> #include <asm/byteorder.h> #include <asm/unaligned.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_PPC_PMAC #include <asm/machdep.h> #endif /* CONFIG_PPC_PMAC */ diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 831393078..9cfd7c6c4 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c @@ -90,7 +90,7 @@ #include <asm/processor.h> #include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #ifdef CONFIG_TULIP_DM910X diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 1e9443d9f..d63ff54ae 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -31,7 +31,7 @@ #include <linux/mii.h> #include <linux/crc32.h> #include <asm/unaligned.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_SPARC #include <asm/prom.h> diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index 93845afe1..2a0f80408 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c @@ -40,7 +40,7 @@ #include <asm/processor.h> #include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define uw32(reg, val) iowrite32(val, ioaddr + (reg)) #define ur32(reg) ioread32(ioaddr + (reg)) diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index c7b04ecf5..6acca60b7 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -129,7 +129,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include <linux/rtnetlink.h> #include <linux/crc32.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c index cdbcd1643..878e1574d 100644 --- a/drivers/net/ethernet/dec/tulip/xircom_cb.c +++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c @@ -31,7 +31,7 @@ #include <linux/init.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #ifdef CONFIG_NET_POLL_CONTROLLER #include <asm/irq.h> diff --git a/drivers/net/ethernet/dlink/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h index 369956570..f182e6755 100644 --- a/drivers/net/ethernet/dlink/dl2k.h +++ b/drivers/net/ethernet/dlink/dl2k.h @@ -32,7 +32,7 @@ #include <linux/bitops.h> #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/spinlock.h> #include <linux/time.h> diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c index 50d9c6315..7783667fe 100644 --- a/drivers/net/ethernet/dlink/sundance.c +++ b/drivers/net/ethernet/dlink/sundance.c @@ -91,7 +91,7 @@ static char *media[MAX_UNITS]; #include <linux/skbuff.h> #include <linux/init.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> #include <linux/delay.h> diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c index c706b7a93..9a5ab8948 100644 --- a/drivers/net/ethernet/fealnx.c +++ b/drivers/net/ethernet/fealnx.c @@ -88,7 +88,7 @@ static int full_duplex[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 }; #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> /* These identify the driver base version and may not be removed. */ diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c index edc120094..add5bf84a 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c @@ -45,7 +45,7 @@ #include <linux/vmalloc.h> #include <asm/pgtable.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "fs_enet.h" diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c index 7583a9572..4afdb39a9 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c @@ -41,7 +41,7 @@ #include <asm/pgtable.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "fs_enet.h" diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c index 9ae6cdbca..12c4f00c4 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c @@ -35,7 +35,7 @@ #include <linux/gfp.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_8xx #include <asm/8xx_immap.h> diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c index 22a02a767..599406768 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c @@ -34,7 +34,7 @@ #include <linux/of_platform.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_8xx #include <asm/8xx_immap.h> diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c index 18e8ef203..acfaadc39 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c +++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c @@ -35,7 +35,7 @@ #include <asm/pgtable.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mpc5xxx.h> #include "fs_enet.h" diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 2375a0171..40bf34fd2 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -89,7 +89,7 @@ #include <asm/io.h> #include <asm/reg.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/dma-mapping.h> #include <linux/crc32.h> diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h index 04b552cd4..22b794cba 100644 --- a/drivers/net/ethernet/freescale/gianfar.h +++ b/drivers/net/ethernet/freescale/gianfar.h @@ -41,7 +41,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/crc32.h> #include <linux/workqueue.h> diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c index 21cd88124..e8f02ad12 100644 --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c @@ -33,7 +33,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/crc32.h> #include <asm/types.h> diff --git a/drivers/net/ethernet/freescale/gianfar_sysfs.c b/drivers/net/ethernet/freescale/gianfar_sysfs.c index acb55af7e..51ba1ec08 100644 --- a/drivers/net/ethernet/freescale/gianfar_sysfs.c +++ b/drivers/net/ethernet/freescale/gianfar_sysfs.c @@ -31,7 +31,7 @@ #include <linux/mm.h> #include <linux/device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include "gianfar.h" diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index e04c59818..a5aa94292 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -35,7 +35,7 @@ #include <linux/of_net.h> #include <linux/of_platform.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <asm/immap_qe.h> diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c index e79aaf9ae..fe9ea921f 100644 --- a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c +++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c @@ -33,7 +33,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/types.h> #include "ucc_geth.h" diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c index ef46b58cb..b91efdeff 100644 --- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c +++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c @@ -55,7 +55,7 @@ #include <pcmcia/ciscode.h> #include <pcmcia/ds.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /*====================================================================*/ diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index d300a0c0e..7ba9b689a 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -45,7 +45,7 @@ #include <asm/processor.h> #include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/dcr.h> #include <asm/dcr-regs.h> diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index 82a967c95..aae838153 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c @@ -29,7 +29,7 @@ /* ethtool support for e1000 */ #include "e1000.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> enum {NETDEV_STATS, E1000_STATS}; diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c index dbb7dd2f8..469504a0a 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c @@ -30,7 +30,7 @@ #include "ixgb.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define IXGB_ALL_RAR_ENTRIES 16 diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c index 7a5e29558..9f8984728 100644 --- a/drivers/net/ethernet/natsemi/natsemi.c +++ b/drivers/net/ethernet/natsemi/natsemi.c @@ -51,7 +51,7 @@ #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DRV_NAME "natsemi" #define DRV_VERSION "2.1" diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c index d3b47003a..2e3846c25 100644 --- a/drivers/net/ethernet/natsemi/ns83820.c +++ b/drivers/net/ethernet/natsemi/ns83820.c @@ -120,7 +120,7 @@ #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define DRV_NAME "ns83820" diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c index cac33e5f9..37ab6dc15 100644 --- a/drivers/net/ethernet/packetengines/hamachi.c +++ b/drivers/net/ethernet/packetengines/hamachi.c @@ -160,7 +160,7 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include <linux/delay.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> #include <asm/unaligned.h> diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c index d28593b1f..2bea504ea 100644 --- a/drivers/net/ethernet/packetengines/yellowfin.c +++ b/drivers/net/ethernet/packetengines/yellowfin.c @@ -100,7 +100,7 @@ static int gx_fix; #include <linux/ethtool.h> #include <linux/crc32.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/unaligned.h> #include <asm/io.h> diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index 437d4cfd4..a992fedce 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -76,7 +76,7 @@ #include <linux/cache.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* These identify the driver base version and may not be removed. */ static char version[] = diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index 7ed08c32a..7317411ca 100644 --- a/drivers/net/ethernet/sgi/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c @@ -61,7 +61,7 @@ #include <asm/byteorder.h> #include <asm/io.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sn/types.h> #include <asm/sn/ioc3.h> #include <asm/pci/bridge.h> diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c index eb4aea3fe..127a5189e 100644 --- a/drivers/net/ethernet/sis/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c @@ -74,7 +74,7 @@ #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> /* User space memory access functions */ +#include <linux/uaccess.h> /* User space memory access functions */ #include "sis900.h" diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c index 03b256af7..d32709c67 100644 --- a/drivers/net/ethernet/smsc/epic100.c +++ b/drivers/net/ethernet/smsc/epic100.c @@ -86,7 +86,7 @@ static int rx_copybreak; #include <linux/crc32.h> #include <linux/bitops.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> /* These identify the driver base version and may not be removed. */ diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c index 656d2e2eb..002f12573 100644 --- a/drivers/net/ethernet/smsc/smc91c92_cs.c +++ b/drivers/net/ethernet/smsc/smc91c92_cs.c @@ -53,7 +53,7 @@ #include <pcmcia/ss.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /*====================================================================*/ diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 4c682a3d0..74608487f 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -101,7 +101,7 @@ #include <linux/atomic.h> #include <asm/io.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define cas_page_map(x) kmap_atomic((x)) #define cas_page_unmap(x) kunmap_atomic((x)) diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 5f3f9d527..abb97f5e1 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c @@ -43,7 +43,7 @@ #include <asm/io.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #ifdef CONFIG_SPARC diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 436fa9d5a..31a03d87a 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -49,7 +49,7 @@ #include <asm/prom.h> #include <asm/auxio.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/irq.h> diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index c879969e8..06f3479e6 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -109,7 +109,7 @@ static const int multicast_filter_limit = 32; #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dmi.h> /* These identify the driver base version and may not be removed. */ diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c index bdd20b888..236d6a8f2 100644 --- a/drivers/net/ethernet/xircom/xirc2ps_cs.c +++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c @@ -89,7 +89,7 @@ #include <pcmcia/ciscode.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifndef MANFID_COMPAQ #define MANFID_COMPAQ 0x0138 diff --git a/drivers/net/fddi/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c index d5bd563ac..c159032a8 100644 --- a/drivers/net/fddi/skfp/skfddi.c +++ b/drivers/net/fddi/skfp/skfddi.c @@ -88,7 +88,7 @@ static const char * const boot_msg = #include <asm/byteorder.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "h/types.h" #undef ADDR // undo Linux definition diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 1450e33fc..7eaa25eb8 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -13,7 +13,7 @@ */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/string.h> #include <linux/mm.h> diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 484f77ec2..3daafeca1 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -55,7 +55,7 @@ #include <linux/jiffies.h> #include <linux/random.h> #include <net/ax25.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* --------------------------------------------------------------------- */ diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index acb636963..82c890ee5 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c @@ -86,7 +86,7 @@ #include <linux/bitops.h> #include <linux/jiffies.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* --------------------------------------------------------------------- */ diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c index a974727dd..90495bd59 100644 --- a/drivers/net/hamradio/baycom_ser_fdx.c +++ b/drivers/net/hamradio/baycom_ser_fdx.c @@ -81,7 +81,7 @@ #include <linux/baycom.h> #include <linux/jiffies.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c index e349d8674..376f77058 100644 --- a/drivers/net/hamradio/baycom_ser_hdx.c +++ b/drivers/net/hamradio/baycom_ser_hdx.c @@ -67,7 +67,7 @@ #include <linux/string.h> #include <linux/init.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/hdlcdrv.h> #include <linux/baycom.h> diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 02de6c891..c7d2b370e 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c @@ -69,7 +69,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/notifier.h> diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index 6636022a1..3568a43b9 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c @@ -40,7 +40,7 @@ #include <asm/dma.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/ax25.h> #include "z8530.h" diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 5d78c1d08..b7fef00aa 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c @@ -58,7 +58,7 @@ #include <linux/hdlcdrv.h> #include <linux/random.h> #include <net/ax25.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/crc-ccitt.h> diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 8e01c4570..e62279fc0 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c @@ -18,7 +18,7 @@ */ #include <linux/module.h> #include <linux/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/crc16.h> #include <linux/string.h> #include <linux/mm.h> diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index bc1d52170..5553f12b0 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c @@ -178,7 +178,7 @@ #include <asm/irq.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "z8530.h" diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 82529a265..993670906 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -68,7 +68,7 @@ #include <linux/seq_file.h> #include <net/net_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/init.h> #include <linux/yam.h> diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c index fc3b18e59..527f32587 100644 --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c @@ -47,7 +47,7 @@ #include <asm/byteorder.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define rr_if_busy(dev) netif_queue_stopped(dev) #define rr_if_running(dev) netif_running(dev) diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index 0d71fa9f0..945368e4f 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c @@ -31,7 +31,7 @@ #include <linux/slab.h> #include <linux/tty.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/delay.h> #include <linux/mutex.h> diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c index 7b4833874..d5153c08d 100644 --- a/drivers/net/irda/kingsun-sir.c +++ b/drivers/net/irda/kingsun-sir.c @@ -72,7 +72,7 @@ #include <asm/unaligned.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/irda/irda.h> #include <net/irda/wrapper.h> diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index 5f3aeac3f..da9bc72b5 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c @@ -124,7 +124,7 @@ #include <asm/unaligned.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/irda/irda.h> #include <net/irda/wrapper.h> diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c index 2d4b6a1ab..072c6f4a3 100644 --- a/drivers/net/irda/ksdazzle-sir.c +++ b/drivers/net/irda/ksdazzle-sir.c @@ -88,7 +88,7 @@ #include <asm/unaligned.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/irda/irda.h> #include <net/irda/wrapper.h> diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index f07c34099..c3d7df71b 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c @@ -56,7 +56,7 @@ #include <asm/unaligned.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/irda/irda.h> #include <net/irda/wrapper.h> diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 5f4758492..f194eae6e 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c @@ -46,7 +46,7 @@ MODULE_LICENSE("GPL"); #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <net/irda/irda.h> diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index fcbf680c3..2fcc7e463 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -41,7 +41,7 @@ #include <linux/in.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/inet.h> diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c index db472ffb6..950d6f993 100644 --- a/drivers/net/phy/cicada.c +++ b/drivers/net/phy/cicada.c @@ -32,7 +32,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Cicada Extended Control Register 1 */ #define MII_CIS8201_EXT_CON1 0x17 diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 383e8338a..a0870df3c 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c @@ -32,7 +32,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define MII_DM9161_SCR 0x10 #define MII_DM9161_SCR_INIT 0x0610 diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index b5ddd5077..9d2e7514f 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c @@ -28,7 +28,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> MODULE_DESCRIPTION("ICPlus IP175C/IP101A/IP101G/IC1001 PHY drivers"); MODULE_AUTHOR("Michael Barkowski"); diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index ff2e45e9c..2c2a6f63a 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c @@ -32,7 +32,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* The Level one LXT970 is used by many boards */ diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index b23f36a5b..2e18a7906 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -36,7 +36,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define MII_MARVELL_PHY_PAGE 22 diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index dc9209742..d6e173cba 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -39,7 +39,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /** * mdiobus_alloc_size - allocate a mii_bus structure diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index db49e0b84..e9e9a3fc6 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -40,7 +40,7 @@ #include <linux/atomic.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /** * phy_print_status - Convenience function to print out the current phy status diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 3657b4a29..0ac84529b 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -36,7 +36,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> MODULE_DESCRIPTION("PHY library"); MODULE_AUTHOR("Andy Fleming"); diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c index fe0d0a15d..06f4a5ea2 100644 --- a/drivers/net/phy/qsemi.c +++ b/drivers/net/phy/qsemi.c @@ -32,7 +32,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* ------------------------------------------------------------------------- */ /* The Quality Semiconductor QS6612 is used on the RPX CLLF */ diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c index 9c889e030..feb9569e3 100644 --- a/drivers/net/ppp/ppp_async.c +++ b/drivers/net/ppp/ppp_async.c @@ -34,7 +34,7 @@ #include <linux/jiffies.h> #include <linux/slab.h> #include <asm/unaligned.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/string.h> #define PPP_VERSION "2.4.2" diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c index 925d3e295..9ae53986c 100644 --- a/drivers/net/ppp/ppp_synctty.c +++ b/drivers/net/ppp/ppp_synctty.c @@ -47,7 +47,7 @@ #include <linux/interrupt.h> #include <linux/slab.h> #include <asm/unaligned.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define PPP_VERSION "2.4.2" diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 2840cf608..df1165f36 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -83,7 +83,7 @@ #include <net/netns/generic.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define PPPOE_HASH_BITS 4 #define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS) diff --git a/drivers/net/ppp/pppolac.c b/drivers/net/ppp/pppolac.c index a5d3d634f..561cc199e 100644 --- a/drivers/net/ppp/pppolac.c +++ b/drivers/net/ppp/pppolac.c @@ -35,7 +35,7 @@ #include <linux/if_pppox.h> #include <linux/ppp_channel.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define L2TP_CONTROL_BIT 0x80 #define L2TP_LENGTH_BIT 0x40 diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c index 6016d29c0..8f2967bf8 100644 --- a/drivers/net/ppp/pppopns.c +++ b/drivers/net/ppp/pppopns.c @@ -34,7 +34,7 @@ #include <linux/if_ppp.h> #include <linux/if_pppox.h> #include <linux/ppp_channel.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define GRE_HEADER_SIZE 8 diff --git a/drivers/net/ppp/pppox.c b/drivers/net/ppp/pppox.c index 2940e9fe3..525353467 100644 --- a/drivers/net/ppp/pppox.c +++ b/drivers/net/ppp/pppox.c @@ -34,7 +34,7 @@ #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static const struct pppox_proto *pppox_protos[PX_MAX_PROTO + 1]; diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index 66c2f1a01..6dc02bf25 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c @@ -55,7 +55,7 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; #include <asm/io.h> #include <asm/processor.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef SB1000_DEBUG static int sb1000_debug = SB1000_DEBUG; diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c index b52eabc16..9fa089278 100644 --- a/drivers/net/slip/slhc.c +++ b/drivers/net/slip/slhc.c @@ -75,7 +75,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <linux/timer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/checksum.h> #include <asm/unaligned.h> diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c index ca3e73753..4af398efd 100644 --- a/drivers/net/slip/slip.c +++ b/drivers/net/slip/slip.c @@ -64,7 +64,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/sched.h> #include <linux/string.h> diff --git a/drivers/net/tun.c b/drivers/net/tun.c index d818f990c..4d68d92a8 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -69,7 +69,7 @@ #include <net/rtnetlink.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Uncomment to enable debugging */ /* #define TUN_DEBUG 1 */ diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 57da4c10c..704e31fb8 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c @@ -44,7 +44,7 @@ #include <linux/crc32.h> #include <linux/bitops.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #undef DEBUG diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 4fbde8a1f..4ac5b4dd0 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -56,7 +56,7 @@ #include <linux/dma-mapping.h> #include <linux/wait.h> #include <linux/firmware.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #undef DEBUG diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index f32a57ed1..05f4a5cf8 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -42,7 +42,7 @@ #include <linux/usb.h> #include <linux/module.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "pegasus.h" /* diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 59d6a3a58..3c8638f04 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -15,7 +15,7 @@ #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/usb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Version Information */ #define DRIVER_VERSION "v0.6.2 (2004/08/27)" diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c index 6a8a382c5..6f4065f55 100644 --- a/drivers/net/wan/dlci.c +++ b/drivers/net/wan/dlci.c @@ -52,7 +52,7 @@ #include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static const char version[] = "DLCI driver v0.35, 4 Jan 1997, mike.mclagan@linux.org"; diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 851dc7b7e..28954b9ba 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c @@ -95,7 +95,7 @@ #include <asm/cache.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 2dfa1478d..5e6f182be 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c @@ -29,7 +29,7 @@ #include <linux/if.h> #include <linux/hdlc.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "farsync.h" diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c index 62f01b74c..df513e6ec 100644 --- a/drivers/net/wan/hd64570.c +++ b/drivers/net/wan/hd64570.c @@ -40,7 +40,7 @@ #include <linux/string.h> #include <linux/types.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "hd64570.h" #define get_msci(port) (phy_node(port) ? MSCI1_OFFSET : MSCI0_OFFSET) diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c index 6269a09c7..97b8caea9 100644 --- a/drivers/net/wan/hd64572.c +++ b/drivers/net/wan/hd64572.c @@ -40,7 +40,7 @@ #include <linux/string.h> #include <linux/types.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "hd64572.h" #define NAPI_WEIGHT 16 diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index a73b49eb8..a62536b77 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -35,7 +35,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/notifier.h> diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 7ef435bab..1eb14cd8d 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c @@ -60,7 +60,7 @@ #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> //#include <asm/spinlock.h> #define DRIVER_MAJOR_VERSION 1 diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c index 5920c996f..dbe0e2065 100644 --- a/drivers/net/wan/lmc/lmc_media.c +++ b/drivers/net/wan/lmc/lmc_media.c @@ -19,7 +19,7 @@ #include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "lmc.h" #include "lmc_var.h" diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index d43f4efd3..7f7027e12 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c @@ -62,7 +62,7 @@ #include <asm/types.h> #include <asm/byteorder.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sbni.h" diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index de3bbf43f..5594170c4 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c @@ -56,7 +56,7 @@ #include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static const char* version = "SDLA driver v0.30, 12 Sep 1996, mike.mclagan@linux.org"; diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 6125adb52..eee490777 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -45,7 +45,7 @@ #include <linux/if_arp.h> #include <linux/ioport.h> #include <linux/pci.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kthread.h> #include <linux/freezer.h> diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index b827d51c3..b5ac8804b 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -50,7 +50,7 @@ #include <linux/timer.h> #include <asm/byteorder.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index f8639003d..2707b9900 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -32,7 +32,7 @@ #include <asm/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/netdevice.h> diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 15f0fad39..51a090ed9 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c @@ -27,7 +27,7 @@ #include <net/net_namespace.h> #include <net/iw_handler.h> #include <net/lib80211.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "hostap_wlan.h" #include "hostap_80211.h" diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 15920aaa5..1d4327881 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -148,7 +148,7 @@ that only one external action is invoked at a time. #include <linux/dma-mapping.h> #include <linux/proc_fs.h> #include <linux/skbuff.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/fs.h> #include <linux/mm.h> diff --git a/drivers/net/wireless/ipw2x00/libipw_geo.c b/drivers/net/wireless/ipw2x00/libipw_geo.c index 218f2a32d..ce7eda20a 100644 --- a/drivers/net/wireless/ipw2x00/libipw_geo.c +++ b/drivers/net/wireless/ipw2x00/libipw_geo.c @@ -38,7 +38,7 @@ #include <linux/types.h> #include <linux/wireless.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "libipw.h" diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c index 3adb24021..a9e23a193 100644 --- a/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/drivers/net/wireless/ipw2x00/libipw_module.c @@ -46,7 +46,7 @@ #include <linux/types.h> #include <linux/wireless.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/net_namespace.h> #include <net/arp.h> diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c index 95a1ca1e8..c96e33d61 100644 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c @@ -29,7 +29,7 @@ #include <linux/types.h> #include <linux/wireless.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ctype.h> #include <net/lib80211.h> diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c index e8c039879..048f1e3ad 100644 --- a/drivers/net/wireless/ipw2x00/libipw_tx.c +++ b/drivers/net/wireless/ipw2x00/libipw_tx.c @@ -39,7 +39,7 @@ #include <linux/types.h> #include <linux/wireless.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "libipw.h" diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c index 02fc67bcc..fba955b61 100644 --- a/drivers/net/wireless/prism54/isl_38xx.c +++ b/drivers/net/wireless/prism54/isl_38xx.c @@ -21,7 +21,7 @@ #include <linux/types.h> #include <linux/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include "prismcompat.h" diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 1c22b81e6..2430fd9ff 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c @@ -26,7 +26,7 @@ #include <linux/slab.h> #include <linux/pci.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "prismcompat.h" #include "isl_ioctl.h" diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 9b557a1bb..b17592c7c 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -54,7 +54,7 @@ #include <asm/io.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* Warning : these stuff will slow down the driver... */ #define WIRELESS_SPY /* Enable spying addresses */ diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 38d2089f3..f98edbb5d 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c @@ -52,7 +52,7 @@ #include <pcmcia/ds.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "wl3501.h" diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c index 5371b374f..e8f68f573 100644 --- a/drivers/nubus/proc.c +++ b/drivers/nubus/proc.c @@ -25,7 +25,7 @@ #include <linux/init.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> static int diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c index c0cc4e7ff..67935fbbb 100644 --- a/drivers/oprofile/event_buffer.c +++ b/drivers/oprofile/event_buffer.c @@ -18,7 +18,7 @@ #include <linux/capability.h> #include <linux/dcookies.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "oprof.h" #include "event_buffer.h" diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c index 7c12d9c2b..19321ae4e 100644 --- a/drivers/oprofile/oprofilefs.c +++ b/drivers/oprofile/oprofilefs.c @@ -15,7 +15,7 @@ #include <linux/oprofile.h> #include <linux/fs.h> #include <linux/pagemap.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "oprof.h" diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 8b490d770..e023d5d3c 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c @@ -48,7 +48,7 @@ #include <asm/byteorder.h> #include <asm/cache.h> /* for L1_CACHE_BYTES */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/dma.h> #include <asm/io.h> diff --git a/drivers/parisc/ccio-rm-dma.c b/drivers/parisc/ccio-rm-dma.c index f78f6f1ae..1bf988010 100644 --- a/drivers/parisc/ccio-rm-dma.c +++ b/drivers/parisc/ccio-rm-dma.c @@ -40,7 +40,7 @@ #include <linux/pci.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/hardware.h> diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c index af212c6a6..5d9b199a0 100644 --- a/drivers/parisc/eisa_eeprom.c +++ b/drivers/parisc/eisa_eeprom.c @@ -26,7 +26,7 @@ #include <linux/slab.h> #include <linux/fs.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/eisa_eeprom.h> #define EISA_EEPROM_MINOR 241 diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c index caa153133..ea0f7cb16 100644 --- a/drivers/parisc/eisa_enumerator.c +++ b/drivers/parisc/eisa_enumerator.c @@ -15,7 +15,7 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <asm/eisa_bus.h> diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index b48243131..ff1a332d7 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c @@ -49,7 +49,7 @@ #include <asm/param.h> /* HZ */ #include <asm/led.h> #include <asm/pdc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* The control of the LEDs and LCDs on PARISC-machines have to be done completely in software. The necessary calculations are done in a work queue diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c index 0f54ab626..730e9910e 100644 --- a/drivers/parisc/pdc_stable.c +++ b/drivers/parisc/pdc_stable.c @@ -68,7 +68,7 @@ #include <asm/pdc.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/hardware.h> #define PDCS_VERSION "0.30" diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c index 5bed17f68..d998d0ed2 100644 --- a/drivers/parport/daisy.c +++ b/drivers/parport/daisy.c @@ -26,7 +26,7 @@ #include <linux/sched.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #undef DEBUG diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c index 2e21af43d..c0e7d21c8 100644 --- a/drivers/parport/ieee1284_ops.c +++ b/drivers/parport/ieee1284_ops.c @@ -18,7 +18,7 @@ #include <linux/parport.h> #include <linux/delay.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #undef DEBUG /* undef me for production */ diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index 6e3a60c78..dd6d4ccb4 100644 --- a/drivers/parport/parport_gsc.c +++ b/drivers/parport/parport_gsc.c @@ -34,7 +34,7 @@ #include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/superio.h> #include <linux/parport.h> diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c index d763bc9e4..4d1d6eaf3 100644 --- a/drivers/parport/probe.c +++ b/drivers/parport/probe.c @@ -10,7 +10,7 @@ #include <linux/ctype.h> #include <linux/string.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static const struct { const char *token; diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c index 92ed045a5..e0cf3a9b9 100644 --- a/drivers/parport/procfs.c +++ b/drivers/parport/procfs.c @@ -22,7 +22,7 @@ #include <linux/ctype.h> #include <linux/sysctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS) diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index c35e8ad6d..67385f60f 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c @@ -32,7 +32,7 @@ #include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c index c8eaeb43f..bf7be3ea8 100644 --- a/drivers/pci/hotplug/cpqphp_core.c +++ b/drivers/pci/hotplug/cpqphp_core.c @@ -40,7 +40,7 @@ #include <linux/init.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "cpqphp.h" #include "cpqphp_nvram.h" diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c index 76ba8a1c7..ae3181bbe 100644 --- a/drivers/pci/hotplug/cpqphp_nvram.c +++ b/drivers/pci/hotplug/cpqphp_nvram.c @@ -35,7 +35,7 @@ #include <linux/pci.h> #include <linux/pci_hotplug.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "cpqphp.h" #include "cpqphp_nvram.h" diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c index ec20f74c8..186dc0fd5 100644 --- a/drivers/pci/hotplug/pci_hotplug_core.c +++ b/drivers/pci/hotplug/pci_hotplug_core.c @@ -39,7 +39,7 @@ #include <linux/mutex.h> #include <linux/pci.h> #include <linux/pci_hotplug.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "../pci.h" #include "cpci_hotplug.h" diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 08126087e..a8ded06a8 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c @@ -11,7 +11,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/capability.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include "pci.h" diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c index e1c1ec540..f2ddedad5 100644 --- a/drivers/pci/syscall.c +++ b/drivers/pci/syscall.c @@ -10,7 +10,7 @@ #include <linux/errno.h> #include <linux/pci.h> #include <linux/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "pci.h" SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn, diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 2ac045f27..6dafea098 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -63,7 +63,7 @@ #include <linux/slab.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 54d31c0a9..4913ec1d2 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -74,7 +74,7 @@ #include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dmi.h> #include <linux/jiffies.h> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index eb3467ea6..c1c84ccc6 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -55,7 +55,7 @@ #include <linux/workqueue.h> #include <linux/i8042.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <acpi/acpi_drivers.h> diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c index 0c2013172..2854fbf32 100644 --- a/drivers/pnp/interface.c +++ b/drivers/pnp/interface.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "base.h" diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c index 2365ef37a..2d0366a5e 100644 --- a/drivers/pnp/isapnp/proc.c +++ b/drivers/pnp/isapnp/proc.c @@ -21,7 +21,7 @@ #include <linux/isapnp.h> #include <linux/proc_fs.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern struct pnp_protocol isapnp_protocol; diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c index c212db0fc..5ee6b2a5f 100644 --- a/drivers/pnp/pnpbios/proc.c +++ b/drivers/pnp/pnpbios/proc.c @@ -26,7 +26,7 @@ #include <linux/seq_file.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "pnpbios.h" diff --git a/drivers/power/mediatek/battery_common.c b/drivers/power/mediatek/battery_common.c index b75da558b..5c451cd17 100644 --- a/drivers/power/mediatek/battery_common.c +++ b/drivers/power/mediatek/battery_common.c @@ -55,7 +55,7 @@ #include <linux/suspend.h> #include <asm/scatterlist.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> #include <mach/hardware.h> diff --git a/drivers/power/mediatek/battery_common_fg_20.c b/drivers/power/mediatek/battery_common_fg_20.c index f5be7016d..de6a45305 100644 --- a/drivers/power/mediatek/battery_common_fg_20.c +++ b/drivers/power/mediatek/battery_common_fg_20.c @@ -55,7 +55,7 @@ #include <linux/suspend.h> #include <asm/scatterlist.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> #include <mach/hardware.h> diff --git a/drivers/power/mediatek/battery_meter.c b/drivers/power/mediatek/battery_meter.c index 2e584e937..41ba3af21 100644 --- a/drivers/power/mediatek/battery_meter.c +++ b/drivers/power/mediatek/battery_meter.c @@ -23,7 +23,7 @@ #include <linux/of_address.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_typedefs.h> #include <mach/hardware.h> #include <mach/mt_boot.h> diff --git a/drivers/power/mediatek/battery_meter_fg_20.c b/drivers/power/mediatek/battery_meter_fg_20.c index 9eafd1833..9c5914038 100644 --- a/drivers/power/mediatek/battery_meter_fg_20.c +++ b/drivers/power/mediatek/battery_meter_fg_20.c @@ -23,7 +23,7 @@ #include <linux/of_address.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/mt_typedefs.h> #include <mach/hardware.h> #include <mach/mt_boot.h> diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c index e51cc5fec..3ae589042 100644 --- a/drivers/rtc/rtc-at91rm9200.c +++ b/drivers/rtc/rtc-at91rm9200.c @@ -32,7 +32,7 @@ #include <linux/of.h> #include <linux/of_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "rtc-at91rm9200.h" diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index ca0f213c0..968a58261 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c @@ -31,7 +31,7 @@ #include <asm/div64.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> MODULE_AUTHOR("Yoichi Yuasa <yuasa@linux-mips.org>"); MODULE_DESCRIPTION("NEC VR4100 series RTC driver"); diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index a71bb8aac..58c9f21a3 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c @@ -20,7 +20,7 @@ #include <linux/slab.h> #include <asm/debug.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ipl.h> /* This is ugly... */ diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 6a44b2762..640cf67c5 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c @@ -25,7 +25,7 @@ #include <asm/idals.h> #include <asm/ebcdic.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cio.h> #include <asm/ccwdev.h> #include <asm/itcw.h> diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c index 21ef63cf0..112b1dc04 100644 --- a/drivers/s390/block/dasd_eer.c +++ b/drivers/s390/block/dasd_eer.c @@ -20,7 +20,7 @@ #include <linux/err.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include <asm/ebcdic.h> diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c index 3250cb471..b3057739a 100644 --- a/drivers/s390/block/dasd_erp.c +++ b/drivers/s390/block/dasd_erp.c @@ -15,7 +15,7 @@ #include <asm/debug.h> #include <asm/ebcdic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* This is ugly... */ #define PRINTK_HEADER "dasd_erp:" diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index f64921756..9d309e4b1 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -16,7 +16,7 @@ #include <linux/fs.h> #include <linux/blkpg.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* This is ugly... */ #define PRINTK_HEADER "dasd_gendisk:" diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 8be1b51e9..ba01beacb 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c @@ -21,7 +21,7 @@ #include <asm/ccwdev.h> #include <asm/schid.h> #include <asm/cmb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* This is ugly... */ #define PRINTK_HEADER "dasd_ioctl:" diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index 78ac905a5..c706d8b26 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c @@ -20,7 +20,7 @@ #include <linux/proc_fs.h> #include <asm/debug.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* This is ugly... */ #define PRINTK_HEADER "dasd_proc:" diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index 324a8cd94..f26b26826 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c @@ -41,7 +41,7 @@ #include <linux/suspend.h> #include <linux/platform_device.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define XPRAM_NAME "xpram" #define XPRAM_DEVS 1 /* one partition */ diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 19915c5b2..b392e130b 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c @@ -26,7 +26,7 @@ #include <asm/cio.h> #include <asm/io.h> #include <asm/ebcdic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/delay.h> #include <asm/cpcmd.h> #include <asm/setup.h> diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c index 01463b052..650c511b5 100644 --- a/drivers/s390/char/keyboard.c +++ b/drivers/s390/char/keyboard.c @@ -14,7 +14,7 @@ #include <linux/consolemap.h> #include <linux/kbd_kern.h> #include <linux/kbd_diacr.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "keyboard.h" diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c index 0da3ae3cd..ba9f6a160 100644 --- a/drivers/s390/char/monreader.c +++ b/drivers/s390/char/monreader.c @@ -23,7 +23,7 @@ #include <linux/device.h> #include <linux/slab.h> #include <net/iucv/iucv.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ebcdic.h> #include <asm/extmem.h> diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c index 4600aa10a..e4eaec8b5 100644 --- a/drivers/s390/char/monwriter.c +++ b/drivers/s390/char/monwriter.c @@ -21,7 +21,7 @@ #include <linux/mutex.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ebcdic.h> #include <asm/io.h> #include <asm/appldata.h> diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c index 3b13d58fe..b5b1fa338 100644 --- a/drivers/s390/char/sclp_rw.c +++ b/drivers/s390/char/sclp_rw.c @@ -13,7 +13,7 @@ #include <linux/string.h> #include <linux/spinlock.h> #include <linux/ctype.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sclp.h" #include "sclp_rw.h" diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index 7ed7a5987..a62a32b03 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c @@ -16,7 +16,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ctrlchar.h" #include "sclp.h" diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c index 5aaaa2ec8..6b3b33e46 100644 --- a/drivers/s390/char/sclp_vt220.c +++ b/drivers/s390/char/sclp_vt220.c @@ -25,7 +25,7 @@ #include <linux/reboot.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sclp.h" #define SCLP_VT220_MAJOR TTY_MAJOR diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c index 6dc60725d..25ff3e1ce 100644 --- a/drivers/s390/char/tape_char.c +++ b/drivers/s390/char/tape_char.c @@ -18,7 +18,7 @@ #include <linux/mtio.h> #include <linux/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define TAPE_DBF_AREA tape_core_dbf diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 4dd71ca02..a996a010f 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c @@ -24,7 +24,7 @@ #include <asm/ccwdev.h> #include <asm/cio.h> #include <asm/ebcdic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "raw3270.h" #include "tty3270.h" diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c index 0fdedadff..4e8213edc 100644 --- a/drivers/s390/char/vmcp.c +++ b/drivers/s390/char/vmcp.c @@ -21,7 +21,7 @@ #include <asm/compat.h> #include <asm/cpcmd.h> #include <asm/debug.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "vmcp.h" static debug_info_t *vmcp_debug; diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index 5e41e8453..bf92084fd 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c @@ -21,7 +21,7 @@ #include <linux/interrupt.h> #include <linux/spinlock.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cpcmd.h> #include <asm/debug.h> #include <asm/ebcdic.h> diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c index c180e3135..5c8d02557 100644 --- a/drivers/s390/char/vmur.c +++ b/drivers/s390/char/vmur.c @@ -15,7 +15,7 @@ #include <linux/slab.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cio.h> #include <asm/ccwdev.h> #include <asm/debug.h> diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c index e9b72311e..f132f10e3 100644 --- a/drivers/s390/char/vmwatchdog.c +++ b/drivers/s390/char/vmwatchdog.c @@ -23,7 +23,7 @@ #include <asm/ebcdic.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define MAX_CMDLEN 240 #define MIN_INTERVAL 15 diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c index 9e5e14686..18028cb22 100644 --- a/drivers/s390/char/zcore.c +++ b/drivers/s390/char/zcore.c @@ -21,7 +21,7 @@ #include <asm/ipl.h> #include <asm/sclp.h> #include <asm/setup.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/debug.h> #include <asm/processor.h> #include <asm/irqflags.h> diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index a9fe3de2d..2e9f65bc2 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c @@ -17,7 +17,7 @@ #include <linux/ctype.h> #include <linux/device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cio.h> #include <asm/ipl.h> diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c index 31cfaa556..487efb6aa 100644 --- a/drivers/s390/crypto/zcrypt_api.c +++ b/drivers/s390/crypto/zcrypt_api.c @@ -36,7 +36,7 @@ #include <linux/compat.h> #include <linux/slab.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/hw_random.h> #include <linux/debugfs.h> #include <asm/debug.h> diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c index 1e849d6e1..247960e99 100644 --- a/drivers/s390/crypto/zcrypt_cex2a.c +++ b/drivers/s390/crypto/zcrypt_cex2a.c @@ -30,7 +30,7 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ap_bus.h" #include "zcrypt_api.h" diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c index f2b71d8df..4779915a9 100644 --- a/drivers/s390/crypto/zcrypt_pcica.c +++ b/drivers/s390/crypto/zcrypt_pcica.c @@ -29,7 +29,7 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ap_bus.h" #include "zcrypt_api.h" diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c index 0d90a4334..819d1f46d 100644 --- a/drivers/s390/crypto/zcrypt_pcicc.c +++ b/drivers/s390/crypto/zcrypt_pcicc.c @@ -29,7 +29,7 @@ #include <linux/gfp.h> #include <linux/err.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ap_bus.h" #include "zcrypt_api.h" diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c index 899ffa19f..f8de77568 100644 --- a/drivers/s390/crypto/zcrypt_pcixcc.c +++ b/drivers/s390/crypto/zcrypt_pcixcc.c @@ -31,7 +31,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ap_bus.h" #include "zcrypt_api.h" diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 9ca3996f6..145cbe511 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c @@ -62,7 +62,7 @@ #include <net/dst.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ebcdic.h> #include <net/iucv/iucv.h> diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index fc1339cf9..ffdbb2267 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c @@ -17,7 +17,7 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/atomic.h> -#include <asm/uaccess.h> /* put_/get_user */ +#include <linux/uaccess.h> /* put_/get_user */ #include <asm/io.h> #include <asm/display7seg.h> diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index ddbe5a9e7..d93d91fc2 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c @@ -30,7 +30,7 @@ #include <linux/of.h> #include <linux/of_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/envctrl.h> #include <asm/io.h> diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index d9f268f23..607aca0ba 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c @@ -16,7 +16,7 @@ #include <linux/of.h> #include <linux/of_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> #include <asm/upa.h> diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index 6b4678a79..96e201e8e 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c @@ -37,7 +37,7 @@ #include <linux/string.h> #include <linux/genhd.h> #include <linux/blkdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> #include <asm/pcic.h> diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 5843288f6..2d2b6792d 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c @@ -40,7 +40,7 @@ #include <linux/fs.h> #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/openpromio.h> #ifdef CONFIG_PCI #include <linux/pci.h> diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 6adf9abdf..c51d891c4 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c @@ -95,7 +95,7 @@ #include <linux/slab.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index 61702ac00..986324b88 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -67,7 +67,7 @@ #include <linux/slab.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index 8843ad783..cacdd0eff 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -211,7 +211,7 @@ #include <linux/mutex.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index 681434e2d..c1490704a 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -32,7 +32,7 @@ #include <linux/slab.h> #include <linux/completion.h> #include <linux/blkdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/highmem.h> /* For flush_kernel_dcache_page */ #include <linux/module.h> diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index d6fcadd7d..860ae4b8a 100644 --- a/drivers/scsi/aacraid/commctrl.c +++ b/drivers/scsi/aacraid/commctrl.c @@ -41,7 +41,7 @@ #include <linux/delay.h> /* ssleep prototype */ #include <linux/kthread.h> #include <linux/semaphore.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi_host.h> #include "aacraid.h" diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index 8d9477cc3..cba85a5d2 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c @@ -61,7 +61,7 @@ #include <linux/aer.h> #include <asm/dma.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi_host.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index ae2564d31..cfbd68107 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -26,7 +26,7 @@ #include <linux/fs.h> #include <linux/pci.h> #include <linux/firmware.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/fcntl.h> #include "bfad_drv.h" diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index 19e1b4222..b9202885d 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c @@ -37,7 +37,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver"); //////////////////////////////////////////////////////////////// #include <linux/ioctl.h> /* For SCSI-Passthrough */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/stat.h> #include <linux/slab.h> /* for kmalloc() */ diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index aec3d4da2..4d615325c 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -130,7 +130,7 @@ #include <asm/dma.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/spinlock.h> #include <linux/blkdev.h> #include <linux/scatterlist.h> diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c index ee196b363..618ad262c 100644 --- a/drivers/scsi/hptiop.c +++ b/drivers/scsi/hptiop.c @@ -26,7 +26,7 @@ #include <linux/timer.h> #include <linux/spinlock.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/div64.h> #include <scsi/scsi_cmnd.h> diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index 45b9566b9..b782bb60b 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h @@ -51,7 +51,7 @@ #define _IPS_H_ #include <linux/nmi.h> - #include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> /* diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 60cf7b1f5..a8a13940c 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -34,7 +34,7 @@ #include <linux/mm.h> #include <linux/fs.h> #include <linux/blkdev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/completion.h> #include <linux/delay.h> diff --git a/drivers/scsi/megaraid/megaraid_mm.h b/drivers/scsi/megaraid/megaraid_mm.h index 55b425c0a..a30e725f2 100644 --- a/drivers/scsi/megaraid/megaraid_mm.h +++ b/drivers/scsi/megaraid/megaraid_mm.h @@ -17,7 +17,7 @@ #include <linux/spinlock.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/pci.h> diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 0626a168c..9332330d1 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -43,7 +43,7 @@ #include <linux/delay.h> #include <linux/uio.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fs.h> #include <linux/compat.h> #include <linux/blkdev.h> diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 0727ea7cc..a1a4da597 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c @@ -52,7 +52,7 @@ static const char * osst_version = "0.99.4"; #include <linux/delay.h> #include <linux/jiffies.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/dma.h> /* The driver prints some debugging information on the console if DEBUG diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index 3bef6736d..3458e2a5c 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c @@ -9,7 +9,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * NVRAM support routines diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index d9564fb04..54d475c14 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c @@ -12,7 +12,7 @@ #include <linux/sched.h> #include <linux/mm.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c index 86f0c5d5c..526acdf3d 100644 --- a/drivers/scsi/scsi_proc.c +++ b/drivers/scsi/scsi_proc.c @@ -26,7 +26,7 @@ #include <linux/seq_file.h> #include <linux/mutex.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_device.h> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 1b1f47c66..ccdee71a7 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -51,7 +51,7 @@ #include <linux/async.h> #include <linux/slab.h> #include <linux/pm_runtime.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> #include <scsi/scsi.h> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index c1f23abd7..026e1616b 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -46,7 +46,7 @@ #include <linux/mutex.h> #include <linux/slab.h> #include <linux/pm_runtime.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_dbg.h> diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c index a3911c39e..efff2fba8 100644 --- a/drivers/scsi/sr_ioctl.c +++ b/drivers/scsi/sr_ioctl.c @@ -10,7 +10,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_dbg.h> diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 882b31c54..938d17027 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -41,7 +41,7 @@ static const char *verstr = "20101219"; #include <linux/delay.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/dma.h> #include <scsi/scsi.h> diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index a08f923b9..b298fbf03 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -37,7 +37,7 @@ #include <linux/spi/spi.h> #include <linux/spi/spidev.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h index da47db8c8..9b525b824 100644 --- a/drivers/staging/bcm/headers.h +++ b/drivers/staging/bcm/headers.h @@ -34,7 +34,7 @@ #include <linux/tcp.h> #include <linux/udp.h> #include <linux/usb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/ip.h> #include "Typedefs.h" diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c index bdc25236a..0b4569fa8 100644 --- a/drivers/staging/csr/drv.c +++ b/drivers/staging/csr/drv.c @@ -33,7 +33,7 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/poll.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/jiffies.h> #include <linux/version.h> diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c index b42a4d6a0..7193790c2 100644 --- a/drivers/staging/csr/firmware.c +++ b/drivers/staging/csr/firmware.c @@ -19,7 +19,7 @@ #include <linux/kmod.h> #include <linux/vmalloc.h> #include <linux/firmware.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "csr_wifi_hip_unifi.h" #include "csr_wifi_hip_unifi_udi.h" #include "unifiio.h" diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c index 458bca062..3de89000b 100644 --- a/drivers/staging/csr/sme_wext.c +++ b/drivers/staging/csr/sme_wext.c @@ -16,7 +16,7 @@ #include <linux/types.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ctype.h> #include "unifi_priv.h" #include <linux/rtnetlink.h> diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c index de8ac0bc2..5d55dc109 100644 --- a/drivers/staging/cxt1e1/hwprobe.c +++ b/drivers/staging/cxt1e1/hwprobe.c @@ -17,7 +17,7 @@ #include <linux/netdevice.h> #include <linux/hdlc.h> #include <linux/if_arp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/rtnetlink.h> #include <linux/pci.h> #include "pmcc4_sysdep.h" diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c index a829b6231..97a909837 100644 --- a/drivers/staging/cxt1e1/linux.c +++ b/drivers/staging/cxt1e1/linux.c @@ -20,7 +20,7 @@ #include <linux/hdlc.h> #include <linux/if_arp.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/rtnetlink.h> #include <linux/skbuff.h> #include "pmcc4_sysdep.h" diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c index 9361dd8ce..1c4d29e63 100644 --- a/drivers/staging/cxt1e1/sbeproc.c +++ b/drivers/staging/cxt1e1/sbeproc.c @@ -21,7 +21,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "pmcc4_sysdep.h" #include "sbecom_inline_linux.h" #include "pmcc4_private.h" diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c index 47cc365c6..f94c5163a 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c @@ -31,7 +31,7 @@ #include <linux/timer.h> #include <linux/delay.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/vmalloc.h> #include "ft1000.h" diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c index 94e426e4d..a8b787369 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c @@ -24,7 +24,7 @@ #include <linux/vmalloc.h> #include <linux/netdevice.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ft1000.h" #define FT1000_PROC "ft1000" diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index 00f9af06a..ee60d6a18 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c @@ -20,7 +20,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/etherdevice.h> #include "dot11d.h" diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c index 89ed86ef0..34ce177e5 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c @@ -49,7 +49,7 @@ #include <linux/types.h> #include <linux/wireless.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/if_vlan.h> #include "ieee80211.h" diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c index e0870c05a..2802c669f 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c @@ -48,7 +48,7 @@ #include <linux/types.h> #include <linux/wireless.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/arp.h> #include "ieee80211.h" diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index 900adc12e..d2e4e364c 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c @@ -39,7 +39,7 @@ #include <linux/types.h> #include <linux/wireless.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ctype.h> #include "ieee80211.h" diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 294e08def..31817a5bf 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -19,7 +19,7 @@ #include <linux/random.h> #include <linux/delay.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/etherdevice.h> #include "dot11d.h" diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c index 63c7bb3c2..692f69b0f 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c @@ -49,7 +49,7 @@ #include <linux/types.h> #include <linux/wireless.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/if_vlan.h> #include "ieee80211.h" diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index e30c5620c..d7f8dfa41 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -58,7 +58,7 @@ double __extendsfdf2(float a) {return a;} #define CONFIG_RTL8192_IO_MAP -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "r8192U_hw.h" #include "r8192U.h" #include "r8190_rtl8256.h" /* RTL8225 Radio frontend */ diff --git a/drivers/staging/sb105x/sb_pci_mp.h b/drivers/staging/sb105x/sb_pci_mp.h index a15f470a1..f2656dfd7 100644 --- a/drivers/staging/sb105x/sb_pci_mp.h +++ b/drivers/staging/sb105x/sb_pci_mp.h @@ -16,7 +16,7 @@ #include <linux/pci.h> #include <linux/circ_buf.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/segment.h> diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c index f28f15bae..df43d04d0 100644 --- a/drivers/staging/wlags49_h2/wl_main.c +++ b/drivers/staging/wlags49_h2/wl_main.c @@ -89,7 +89,7 @@ // #include <asm/io.h> // // #include <asm/bitops.h> #include <linux/unistd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index 6226e5eeb..bb8a76ee3 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c @@ -80,7 +80,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/bitops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ethtool.h> #include <linux/netdevice.h> diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c index beabf5916..de8f440b2 100644 --- a/drivers/staging/wlags49_h2/wl_profile.c +++ b/drivers/staging/wlags49_h2/wl_profile.c @@ -84,7 +84,7 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/unistd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <limits.h> #define BIN_DL 1 diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index c731ff2a6..fe17b4c4a 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c @@ -63,7 +63,7 @@ #include <linux/ioport.h> #include <linux/delay.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <debug.h> #include <hcf.h> diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 083710e02..9468d2945 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -128,7 +128,7 @@ static struct serial_state rs_table[1]; #define NR_PORTS ARRAY_SIZE(rs_table) -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define serial_isroot() (capable(CAP_SYS_ADMIN)) diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c index f179033ea..6c4a30dd7 100644 --- a/drivers/tty/hvc/hvc_console.c +++ b/drivers/tty/hvc/hvc_console.c @@ -42,7 +42,7 @@ #include <linux/slab.h> #include <linux/serial_core.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "hvc_console.h" diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c index 81e939e90..5803968bf 100644 --- a/drivers/tty/hvc/hvcs.c +++ b/drivers/tty/hvc/hvcs.c @@ -81,7 +81,7 @@ #include <linux/tty_flip.h> #include <asm/hvconsole.h> #include <asm/hvcserver.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/vio.h> /* diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c index 41901997c..f57aae29f 100644 --- a/drivers/tty/hvc/hvsi.c +++ b/drivers/tty/hvc/hvsi.c @@ -46,7 +46,7 @@ #include <asm/hvcall.h> #include <asm/hvconsole.h> #include <asm/prom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/vio.h> #include <asm/param.h> #include <asm/hvsi.h> diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c index 1deaca467..d97f1174e 100644 --- a/drivers/tty/moxa.c +++ b/drivers/tty/moxa.c @@ -47,7 +47,7 @@ #include <linux/ratelimit.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "moxa.h" diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index 4c4a23674..ec0edc56b 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -43,7 +43,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "mxser.h" diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c index 10e0c86cc..f3b4bc23c 100644 --- a/drivers/tty/n_hdlc.c +++ b/drivers/tty/n_hdlc.c @@ -103,7 +103,7 @@ #include <linux/bitops.h> #include <asm/termios.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Buffers for individual HDLC frames diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c index 1e6405070..c913c1c36 100644 --- a/drivers/tty/n_r3964.c +++ b/drivers/tty/n_r3964.c @@ -65,7 +65,7 @@ #include <linux/n_r3964.h> #include <linux/poll.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /*#define DEBUG_QUEUE*/ diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c index 5dc9c4bfa..4465a48b2 100644 --- a/drivers/tty/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c @@ -40,7 +40,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/delay.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* (es) */ /* note: perhaps we can murge these files, so that you can just diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index 18ed5aebb..7f654e494 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c @@ -54,7 +54,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "icom.h" diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 57977ec53..3eb1a6a31 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -35,7 +35,7 @@ #include <linux/mutex.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * This is used to lock changes in serial line configuration. diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c index 8eaf1ab8a..a48addcb4 100644 --- a/drivers/tty/synclink.c +++ b/drivers/tty/synclink.c @@ -107,7 +107,7 @@ #define PUT_USER(error,value,addr) error = put_user(value,addr) #define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0 -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define RCLRVALUE 0xffff diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c index 1abf94646..24a00a084 100644 --- a/drivers/tty/synclink_gt.c +++ b/drivers/tty/synclink_gt.c @@ -77,7 +77,7 @@ #include <asm/irq.h> #include <asm/dma.h> #include <asm/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #if defined(CONFIG_HDLC) || (defined(CONFIG_HDLC_MODULE) && defined(CONFIG_SYNCLINK_GT_MODULE)) #define SYNCLINK_GENERIC_HDLC 1 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c index ff171384e..87fb51c4d 100644 --- a/drivers/tty/synclinkmp.c +++ b/drivers/tty/synclinkmp.c @@ -79,7 +79,7 @@ #define PUT_USER(error,value,addr) error = put_user(value,addr) #define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0 -#include <asm/uaccess.h> +#include <linux/uaccess.h> static MGSL_PARAMS default_params = { MGSL_MODE_HDLC, /* unsigned long mode */ diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c index b46aca5cc..47bc75559 100644 --- a/drivers/tty/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c @@ -22,7 +22,7 @@ #include <linux/compat.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #undef TTY_DEBUG_WAIT_UNTIL_SENT diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index 2978ca596..9b6b5ee13 100644 --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/init.h> #include <linux/tty.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/console.h> #include <linux/consolemap.h> #include <linux/vt_kern.h> diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c index 60b7b6926..03cdc3dfe 100644 --- a/drivers/tty/vt/selection.c +++ b/drivers/tty/vt/selection.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kbd_kern.h> #include <linux/vt_kern.h> diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c index d7799deac..1d43bc12f 100644 --- a/drivers/tty/vt/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c @@ -39,7 +39,7 @@ #include <linux/slab.h> #include <linux/notifier.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <asm/unaligned.h> diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index 2bd78e2ac..864c5e5d2 100644 --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c @@ -29,7 +29,7 @@ #include <linux/timex.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kbd_kern.h> #include <linux/vt_kern.h> diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 38c8a11bb..464c37483 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c @@ -64,7 +64,7 @@ #include "usbatm.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/crc32.h> #include <linux/errno.h> #include <linux/init.h> diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 561ebede4..658bc97f1 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -49,7 +49,7 @@ #include <linux/security.h> #include <linux/user_namespace.h> #include <linux/scatterlist.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <linux/moduleparam.h> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 860096805..e760de085 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -28,7 +28,7 @@ #include <linux/random.h> #include <linux/pm_qos.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include "hub.h" diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 15d993571..385ceb18c 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -2619,7 +2619,7 @@ static int android_create_device(struct android_dev *dev) #ifdef CONFIG_USBIF_COMPLIANCE #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/seq_file.h> diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index a4797bcfd..027eedf56 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c @@ -20,7 +20,7 @@ #include <linux/uts.h> #include <linux/wait.h> #include <linux/compiler.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sched.h> #include <linux/slab.h> #include <linux/poll.h> diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 4a86b6374..13460ce9c 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c @@ -42,7 +42,7 @@ #include <linux/bitops.h> #include <linux/dmi.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 90f85d8a3..59aed2dd6 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -31,7 +31,7 @@ #include "xhci.h" #ifdef CONFIG_MTK_XHCI -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/xhci/xhci-mtk-scheduler.h> @@ -40,7 +40,7 @@ #ifdef CONFIG_USBIF_COMPLIANCE #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/seq_file.h> #include <linux/kobject.h> #include <linux/miscdevice.h> diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index 50663dcce..3b866e0aa 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c @@ -25,7 +25,7 @@ #include <linux/module.h> #include <linux/usb.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_USB_DEBUG static int debug = 5; diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index aae550219..19bef43b5 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c @@ -45,7 +45,7 @@ #include <linux/module.h> #include <linux/kref.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/usb.h> #include <linux/workqueue.h> #include <linux/platform_device.h> diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index 3b885c61b..3aacef958 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c @@ -24,7 +24,7 @@ #include <linux/module.h> #include <linux/completion.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/usb.h> /* image constants */ diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index ac762299e..6a96681c6 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c @@ -29,7 +29,7 @@ #include <linux/module.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/input.h> #include <linux/usb.h> #include <linux/poll.h> diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c index c3e9cfc7c..13bb4387c 100644 --- a/drivers/usb/misc/legousbtower.c +++ b/drivers/usb/misc/legousbtower.c @@ -82,7 +82,7 @@ #include <linux/module.h> #include <linux/completion.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/usb.h> #include <linux/poll.h> diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c index 9a62e89d6..8bddf2728 100644 --- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c @@ -19,7 +19,7 @@ #include <linux/scatterlist.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "usb_mon.h" diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c index ebd6189a5..69cf46885 100644 --- a/drivers/usb/mon/mon_stat.c +++ b/drivers/usb/mon/mon_stat.c @@ -12,7 +12,7 @@ #include <linux/export.h> #include <linux/usb.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "usb_mon.h" diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c index 060d78d53..236c58b99 100644 --- a/drivers/usb/mon/mon_text.c +++ b/drivers/usb/mon/mon_text.c @@ -13,7 +13,7 @@ #include <linux/mutex.h> #include <linux/debugfs.h> #include <linux/scatterlist.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "usb_mon.h" diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c index 4c216790e..e5759df69 100644 --- a/drivers/usb/musb/musb_debugfs.c +++ b/drivers/usb/musb/musb_debugfs.c @@ -37,7 +37,7 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "musb_core.h" #include "musb_debug.h" diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c index fa44fbed3..3a41b765d 100644 --- a/drivers/video/68328fb.c +++ b/drivers/video/68328fb.c @@ -35,7 +35,7 @@ #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fb.h> #include <linux/init.h> diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c index b05afd037..10e0376b0 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -21,7 +21,7 @@ #include <linux/slab.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/gio_device.h> diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index c2414d6ab..d61da14c2 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c @@ -22,7 +22,7 @@ #include <linux/fb.h> #include <asm/machvec.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> #include <asm/hd64461.h> diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c index b802f93ce..eaedd38d9 100644 --- a/drivers/video/hpfb.c +++ b/drivers/video/hpfb.c @@ -16,7 +16,7 @@ #include <linux/dio.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static struct fb_info fb_info = { .fix = { diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index cfdb380ec..0bb9e4f77 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -32,7 +32,7 @@ #include <linux/platform_data/video-mx3fb.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define MX3FB_NAME "mx3_sdc_fb" diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c index d44c7351d..d422ba687 100644 --- a/drivers/video/q40fb.c +++ b/drivers/video/q40fb.c @@ -18,7 +18,7 @@ #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> #include <asm/q40_master.h> #include <linux/fb.h> diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index 150197909..27c7dd3cf 100644 --- a/drivers/video/sm501fb.c +++ b/drivers/video/sm501fb.c @@ -31,7 +31,7 @@ #include <linux/console.h> #include <linux/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/div64.h> #ifdef CONFIG_PM diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c index 019a1feef..993c6f9a7 100644 --- a/drivers/video/stifb.c +++ b/drivers/video/stifb.c @@ -66,7 +66,7 @@ #include <linux/ioport.h> #include <asm/grfioctl.h> /* for HP-UX compatibility */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sticore.h" diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c index 7a299e951..85196bad8 100644 --- a/drivers/video/w100fb.c +++ b/drivers/video/w100fb.c @@ -35,7 +35,7 @@ #include <linux/vmalloc.h> #include <linux/module.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <video/w100fb.h> #include "w100fb.h" diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c index 1c15ee745..305c2bb51 100644 --- a/drivers/zorro/proc.c +++ b/drivers/zorro/proc.c @@ -14,7 +14,7 @@ #include <linux/seq_file.h> #include <linux/init.h> #include <linux/export.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/amigahw.h> #include <asm/setup.h> diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index d384a8b77..8bb1cb6c8 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -34,7 +34,7 @@ #include <linux/list.h> #include <linux/pagemap.h> #include <linux/utsname.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/idr.h> #include <net/9p/9p.h> #include <net/9p/client.h> diff --git a/fs/afs/proc.c b/fs/afs/proc.c index 526e4bbbd..6d0bed1f2 100644 --- a/fs/afs/proc.c +++ b/fs/afs/proc.c @@ -14,7 +14,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" static struct proc_dir_entry *proc_afs; @@ -38,7 +38,7 @@ #include <linux/personality.h> #include <asm/kmap_types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define AIO_RING_MAGIC 0xa10a10a1 #define AIO_RING_COMPAT_FEATURES 1 diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c index 47a65df8c..7c917a757 100644 --- a/fs/anon_inodes.c +++ b/fs/anon_inodes.c @@ -20,7 +20,7 @@ #include <linux/magic.h> #include <linux/anon_inodes.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static struct vfsmount *anon_inode_mnt __read_mostly; static struct inode *anon_inode_inode; diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index 3f1128b37..c0fa1289f 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h @@ -35,7 +35,7 @@ #include <linux/mount.h> #include <linux/namei.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* #define DEBUG */ diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index 5e376bb93..64ec7dcd9 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c @@ -15,7 +15,7 @@ #include <linux/buffer_head.h> #include <linux/vfs.h> #include <linux/writeback.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "bfs.h" MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>"); diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index bce87694f..1cc362b2f 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -26,7 +26,7 @@ #include <linux/coredump.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #include <asm/a.out-core.h> diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index baad3aaee..307849cbc 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -34,7 +34,7 @@ #include <linux/utsname.h> #include <linux/coredump.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/param.h> #include <asm/page.h> diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index c166f325a..05ce7ad9d 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -36,7 +36,7 @@ #include <linux/elfcore.h> #include <linux/coredump.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/param.h> #include <asm/pgalloc.h> diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index d50bbe59d..cef9b03fc 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -37,7 +37,7 @@ #include <linux/syscalls.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> #include <asm/cacheflush.h> #include <asm/page.h> diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 1c740e152..d5b85cae1 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -31,7 +31,7 @@ #include <linux/syscalls.h> #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> enum { VERBOSE_STATUS = 1 /* make it zero to save 400 bytes kernel memory */ diff --git a/fs/binfmt_som.c b/fs/binfmt_som.c index 4e00ed68d..4dd9131c9 100644 --- a/fs/binfmt_som.c +++ b/fs/binfmt_som.c @@ -29,7 +29,7 @@ #include <linux/personality.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> diff --git a/fs/block_dev.c b/fs/block_dev.c index 5b5dfcded..e0079385c 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -28,7 +28,7 @@ #include <linux/log2.h> #include <linux/cleancache.h> #include <linux/aio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" struct bdev_inode { diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c index d59748346..ea177e53a 100644 --- a/fs/cifs/cifs_debug.c +++ b/fs/cifs/cifs_debug.c @@ -24,7 +24,7 @@ #include <linux/ctype.h> #include <linux/module.h> #include <linux/proc_fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "cifspdu.h" #include "cifsglob.h" #include "cifsproto.h" diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 4c86850bd..1ff7e8352 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -35,7 +35,7 @@ #include <linux/pagemap.h> #include <linux/swap.h> #include <linux/task_io_accounting_ops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "cifspdu.h" #include "cifsglob.h" #include "cifsacl.h" diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 417ce0a49..086b3b1ad 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -34,7 +34,7 @@ #include <linux/pagevec.h> #include <linux/freezer.h> #include <linux/namei.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> #include <linux/inet.h> #include <linux/module.h> diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index b70aa7c91..c16989123 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -29,7 +29,7 @@ #include <linux/freezer.h> #include <linux/tcp.h> #include <linux/highmem.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> #include <linux/mempool.h> #include "cifspdu.h" diff --git a/fs/coda/cache.c b/fs/coda/cache.c index 9bc1147a6..46ee6f238 100644 --- a/fs/coda/cache.c +++ b/fs/coda/cache.c @@ -13,7 +13,7 @@ #include <linux/fs.h> #include <linux/stat.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/string.h> #include <linux/list.h> #include <linux/sched.h> diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c index 2849f41e7..1326d3896 100644 --- a/fs/coda/coda_linux.c +++ b/fs/coda/coda_linux.c @@ -13,7 +13,7 @@ #include <linux/fs.h> #include <linux/stat.h> #include <linux/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/string.h> #include <linux/coda.h> diff --git a/fs/coda/dir.c b/fs/coda/dir.c index fc66861b3..acba26772 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c @@ -20,7 +20,7 @@ #include <linux/spinlock.h> #include <linux/namei.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/coda.h> #include <linux/coda_psdev.h> diff --git a/fs/coda/file.c b/fs/coda/file.c index 380b798f8..b86e23f22 100644 --- a/fs/coda/file.c +++ b/fs/coda/file.c @@ -18,7 +18,7 @@ #include <linux/spinlock.h> #include <linux/string.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/coda.h> #include <linux/coda_psdev.h> diff --git a/fs/coda/inode.c b/fs/coda/inode.c index 0aa4c4d75..fb897fb60 100644 --- a/fs/coda/inode.c +++ b/fs/coda/inode.c @@ -22,7 +22,7 @@ #include <linux/slab.h> #include <linux/pid_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fs.h> #include <linux/vmalloc.h> diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c index 3f5de96bb..4326d172f 100644 --- a/fs/coda/pioctl.c +++ b/fs/coda/pioctl.c @@ -16,7 +16,7 @@ #include <linux/string.h> #include <linux/namei.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/coda.h> #include <linux/coda_psdev.h> diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index ebc2bae6c..13361173c 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c @@ -40,7 +40,7 @@ #include <linux/pid_namespace.h> #include <asm/io.h> #include <asm/poll.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/coda.h> #include <linux/coda_psdev.h> diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c index 3a731976d..0165804a5 100644 --- a/fs/coda/upcall.c +++ b/fs/coda/upcall.c @@ -27,7 +27,7 @@ #include <linux/string.h> #include <linux/slab.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/vmalloc.h> #include <linux/vfs.h> diff --git a/fs/compat.c b/fs/compat.c index 6af20de2c..7834741c4 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -49,7 +49,7 @@ #include <linux/pagemap.h> #include <linux/aio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/ioctls.h> #include "internal.h" diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 53a1fa6b0..11172f872 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -74,7 +74,7 @@ #include <scsi/sg.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ethtool.h> #include <linux/mii.h> #include <linux/if_bonding.h> diff --git a/fs/configfs/file.c b/fs/configfs/file.c index 2b6cb23dd..6b5898b2b 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c @@ -28,7 +28,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/configfs.h> #include "configfs_internal.h" diff --git a/fs/coredump.c b/fs/coredump.c index 5d5803cb6..eab99447f 100644 --- a/fs/coredump.c +++ b/fs/coredump.c @@ -34,7 +34,7 @@ #include <linux/oom.h> #include <linux/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/tlb.h> #include <asm/exec.h> diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index c01485856..b6e651afc 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -23,7 +23,7 @@ #include <linux/vfs.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static const struct super_operations cramfs_ops; static const struct inode_operations cramfs_dir_inode_operations; diff --git a/fs/dcache.c b/fs/dcache.c index dcb875bdd..13ff1c648 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -26,7 +26,7 @@ #include <linux/export.h> #include <linux/mount.h> #include <linux/file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/security.h> #include <linux/seqlock.h> #include <linux/swap.h> diff --git a/fs/dcookies.c b/fs/dcookies.c index ac44a69fb..9d5e4e1c2 100644 --- a/fs/dcookies.c +++ b/fs/dcookies.c @@ -26,7 +26,7 @@ #include <linux/mutex.h> #include <linux/path.h> #include <linux/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* The dcookies are allocated from a kmem_cache and * hashed onto a small number of lists. None of the diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index e7665c31f..4b519b36b 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h @@ -39,7 +39,7 @@ #include <linux/mutex.h> #include <linux/idr.h> #include <linux/ratelimit.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dlm.h> #include "config.h" diff --git a/fs/efs/efs.h b/fs/efs/efs.h index 5528926ac..c3cbc6c29 100644 --- a/fs/efs/efs.h +++ b/fs/efs/efs.h @@ -8,7 +8,7 @@ #define _EFS_EFS_H_ #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define EFS_VERSION "1.0a" diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 0cff44348..e23849c6c 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -35,7 +35,7 @@ #include <linux/anon_inodes.h> #include <linux/device.h> #include <linux/freezer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/mman.h> #include <linux/atomic.h> @@ -57,7 +57,7 @@ #include <linux/compat.h> #include <linux/random.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/tlb.h> diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c index 5d46c0986..5097391a8 100644 --- a/fs/ext2/ioctl.c +++ b/fs/ext2/ioctl.c @@ -14,7 +14,7 @@ #include <linux/compat.h> #include <linux/mount.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) diff --git a/fs/ext2/super.c b/fs/ext2/super.c index ccc8f00e4..f288a9e59 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -31,7 +31,7 @@ #include <linux/mount.h> #include <linux/log2.h> #include <linux/quotaops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ext2.h" #include "xattr.h" #include "acl.h" diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c index 4d96e9a64..fe8ff23f7 100644 --- a/fs/ext3/ioctl.c +++ b/fs/ext3/ioctl.c @@ -9,7 +9,7 @@ #include <linux/mount.h> #include <linux/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ext3.h" long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) diff --git a/fs/ext3/super.c b/fs/ext3/super.c index b1e30be19..e1d3d1ce3 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -28,7 +28,7 @@ #include <linux/log2.h> #include <linux/cleancache.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define CREATE_TRACE_POINTS diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index a5ca67d1a..d609e9cb6 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -37,7 +37,7 @@ #include <linux/quotaops.h> #include <linux/string.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fiemap.h> #include "ext4_jbd2.h" #include "ext4_extents.h" diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index b156c8e7e..f7a8a3b99 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -15,7 +15,7 @@ #include <linux/mount.h> #include <linux/file.h> #include <linux/random.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ext4_jbd2.h" #include "ext4.h" diff --git a/fs/ext4/super.c b/fs/ext4/super.c index f7f233e25..bc1160cf3 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -38,7 +38,7 @@ #include <linux/log2.h> #include <linux/crc16.h> #include <linux/cleancache.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kthread.h> #include <linux/freezer.h> diff --git a/fs/fcntl.c b/fs/fcntl.c index 659922253..5439affef 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -24,7 +24,7 @@ #include <asm/poll.h> #include <asm/siginfo.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) diff --git a/fs/fhandle.c b/fs/fhandle.c index d59712dfa..5dfefb3f9 100644 --- a/fs/fhandle.c +++ b/fs/fhandle.c @@ -8,7 +8,7 @@ #include <linux/fs_struct.h> #include <linux/fsnotify.h> #include <linux/personality.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" #include "mount.h" diff --git a/fs/filesystems.c b/fs/filesystems.c index 92567d95b..a05b201b8 100644 --- a/fs/filesystems.c +++ b/fs/filesystems.c @@ -14,7 +14,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Handling of filesystem drivers list. diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 80b8bd125..201db7b90 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -22,7 +22,7 @@ #include <linux/swap.h> #include <linux/crc32.h> #include <linux/writeback.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dlm.h> #include <linux/dlm_plock.h> #include <linux/aio.h> diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 943538456..dcb3b4068 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -19,7 +19,7 @@ #include <linux/list.h> #include <linux/wait.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/seq_file.h> #include <linux/debugfs.h> #include <linux/kthread.h> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index bc5dac400..b691c0384 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -19,7 +19,7 @@ #include <linux/crc32.h> #include <linux/fiemap.h> #include <linux/security.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "gfs2.h" #include "incore.h" diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index aa5c48044..410856eac 100644 --- a/fs/gfs2/sys.c +++ b/fs/gfs2/sys.c @@ -13,7 +13,7 @@ #include <linux/buffer_head.h> #include <linux/module.h> #include <linux/kobject.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/gfs2_ondisk.h> #include <linux/genhd.h> diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c index 6402fb69d..6559205bb 100644 --- a/fs/gfs2/util.c +++ b/fs/gfs2/util.c @@ -12,7 +12,7 @@ #include <linux/buffer_head.h> #include <linux/crc32.h> #include <linux/gfs2_ondisk.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "gfs2.h" #include "incore.h" diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c index ecd37f30a..5faf68fbf 100644 --- a/fs/gfs2/xattr.c +++ b/fs/gfs2/xattr.c @@ -13,7 +13,7 @@ #include <linux/buffer_head.h> #include <linux/xattr.h> #include <linux/gfs2_ondisk.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "gfs2.h" #include "incore.h" diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index a73b11839..f213c5f0a 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h @@ -23,7 +23,7 @@ #include <linux/workqueue.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "hfs.h" diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c index d3ff5cc31..ff6c9f99a 100644 --- a/fs/hfsplus/ioctl.c +++ b/fs/hfsplus/ioctl.c @@ -16,7 +16,7 @@ #include <linux/fs.h> #include <linux/mount.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "hfsplus_fs.h" /* diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c index cd3e38972..635cba456 100644 --- a/fs/hppfs/hppfs.c +++ b/fs/hppfs/hppfs.c @@ -17,7 +17,7 @@ #include <linux/types.h> #include <linux/pid_namespace.h> #include <linux/namei.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <os.h> static struct inode *get_inode(struct super_block *, struct dentry *); diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index aef5d7e33..c36fe201a 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -33,7 +33,7 @@ #include <linux/magic.h> #include <linux/migrate.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static const struct super_operations hugetlbfs_ops; static const struct address_space_operations hugetlbfs_aops; diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index fb36e47fa..76e3cde19 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -41,7 +41,7 @@ #define CREATE_TRACE_POINTS #include <trace/events/jbd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> EXPORT_SYMBOL(journal_start); diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index dcd07ed3c..02a50fc5a 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -47,7 +47,7 @@ #define CREATE_TRACE_POINTS #include <trace/events/jbd2.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #ifdef CONFIG_JBD2_DEBUG diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c index 93a123289..afe1536ef 100644 --- a/fs/jfs/ioctl.c +++ b/fs/jfs/ioctl.c @@ -13,7 +13,7 @@ #include <linux/sched.h> #include <linux/blkdev.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "jfs_filsys.h" #include "jfs_debug.h" diff --git a/fs/jfs/jfs_debug.c b/fs/jfs/jfs_debug.c index dd824d9b0..8945d3f5a 100644 --- a/fs/jfs/jfs_debug.c +++ b/fs/jfs/jfs_debug.c @@ -22,7 +22,7 @@ #include <linux/module.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "jfs_incore.h" #include "jfs_filsys.h" #include "jfs_debug.h" diff --git a/fs/jfs/super.c b/fs/jfs/super.c index b7486dafa..3c14b9666 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -31,7 +31,7 @@ #include <linux/exportfs.h> #include <linux/crc32.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/seq_file.h> #include <linux/blkdev.h> diff --git a/fs/libfs.c b/fs/libfs.c index 85120775e..51996b08d 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -14,7 +14,7 @@ #include <linux/writeback.h> #include <linux/buffer_head.h> /* sync_mapping_buffers */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" diff --git a/fs/locks.c b/fs/locks.c index f7b1de7e6..fc8696fee 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -127,7 +127,7 @@ #include <linux/rcupdate.h> #include <linux/pid_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define IS_POSIX(fl) (fl->fl_flags & FL_POSIX) #define IS_FLOCK(fl) (fl->fl_flags & FL_FLOCK) diff --git a/fs/namei.c b/fs/namei.c index 53776cead..047fa43f5 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -35,7 +35,7 @@ #include <linux/fs_struct.h> #include <linux/posix_acl.h> #include <linux/hash.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" #include "mount.h" diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index c578ba994..566ff8597 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c @@ -18,7 +18,7 @@ #include <linux/vmalloc.h> #include <linux/mm.h> #include <linux/namei.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include "ncp_fs.h" diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index 122e26024..7f3d176dd 100644 --- a/fs/ncpfs/file.c +++ b/fs/ncpfs/file.c @@ -6,7 +6,7 @@ * */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/time.h> #include <linux/kernel.h> diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 3f54348b9..e63231339 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c @@ -11,7 +11,7 @@ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <linux/time.h> diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c index 2f970de02..29f01fd61 100644 --- a/fs/ncpfs/ioctl.c +++ b/fs/ncpfs/ioctl.c @@ -20,7 +20,7 @@ #include <linux/vmalloc.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ncp_fs.h" diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c index ee24df5af..6416301cc 100644 --- a/fs/ncpfs/mmap.c +++ b/fs/ncpfs/mmap.c @@ -18,7 +18,7 @@ #include <linux/fcntl.h> #include <linux/memcontrol.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "ncp_fs.h" diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h index 6d5e7c56c..a85130a40 100644 --- a/fs/ncpfs/ncplib_kernel.h +++ b/fs/ncpfs/ncplib_kernel.h @@ -21,7 +21,7 @@ #include <linux/fcntl.h> #include <linux/pagemap.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <asm/unaligned.h> #include <asm/string.h> diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c index 3a1587222..e148bbce9 100644 --- a/fs/ncpfs/sock.c +++ b/fs/ncpfs/sock.c @@ -15,7 +15,7 @@ #include <linux/fcntl.h> #include <linux/stat.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/in.h> #include <linux/net.h> #include <linux/mm.h> diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c index 52439ddc8..83b9ab639 100644 --- a/fs/ncpfs/symlink.c +++ b/fs/ncpfs/symlink.c @@ -21,7 +21,7 @@ */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/fs.h> diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 615c5079d..2cf62a94b 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -52,7 +52,7 @@ #include <linux/nfs_page.h> #include <linux/sunrpc/clnt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include "internal.h" diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 97d98e6c0..088065375 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -30,7 +30,7 @@ #include <linux/gfp.h> #include <linux/swap.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "delegation.h" #include "internal.h" diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index 0fe3ced64..08d41262a 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c @@ -30,7 +30,7 @@ #include <linux/namei.h> #include <linux/security.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 9de39760a..98114722e 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -40,7 +40,7 @@ #include <linux/freezer.h> #include <linux/crc32.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "nfs4_fs.h" #include "callback.h" diff --git a/fs/nfs/super.c b/fs/nfs/super.c index d85c1b819..3e35b4c4b 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -56,7 +56,7 @@ #include <linux/nsproxy.h> #include <linux/rcupdate.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "nfs4_fs.h" #include "callback.h" diff --git a/fs/nfs/write.c b/fs/nfs/write.c index a2c7c2804..99de54ab1 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -22,7 +22,7 @@ #include <linux/backing-dev.h> #include <linux/export.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "delegation.h" #include "internal.h" diff --git a/fs/nfsd/fault_inject.c b/fs/nfsd/fault_inject.c index d620e7f81..5e285f922 100644 --- a/fs/nfsd/fault_inject.c +++ b/fs/nfsd/fault_inject.c @@ -10,7 +10,7 @@ #include <linux/module.h> #include <linux/nsproxy.h> #include <linux/sunrpc/addr.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "state.h" #include "netns.h" diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 11224fa5f..f7096d9df 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -25,7 +25,7 @@ #include <linux/jhash.h> #include <linux/ima.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/exportfs.h> #include <linux/writeback.h> diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index c5670b8d1..275702e0f 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c @@ -30,7 +30,7 @@ #include <linux/aio.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "attrib.h" #include "bitmap.h" diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c index 07ac24fd9..4a05d7aa1 100644 --- a/fs/ocfs2/cluster/masklog.c +++ b/fs/ocfs2/cluster/masklog.c @@ -24,7 +24,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "masklog.h" diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index aa88bd8bc..9e2bb07d3 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -62,7 +62,7 @@ #include <linux/export.h> #include <net/tcp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "heartbeat.h" #include "tcp.h" diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 12bafb726..26db54be1 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -45,7 +45,7 @@ #include <linux/backing-dev.h> #include <linux/poll.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "stackglue.h" #include "userdlm.h" diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index 286edf1e2..9f3969bf6 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c @@ -23,7 +23,7 @@ #include <linux/mutex.h> #include <linux/slab.h> #include <linux/reboot.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "stackglue.h" @@ -19,7 +19,7 @@ #include <linux/mount.h> #include <linux/fcntl.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fs.h> #include <linux/personality.h> #include <linux/pagemap.h> diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index f4026aba2..78fb92b2a 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c @@ -16,7 +16,7 @@ #include <asm/openprom.h> #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static DEFINE_MUTEX(op_mutex); @@ -23,7 +23,7 @@ #include <linux/fcntl.h> #include <linux/aio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ioctls.h> #include "internal.h" diff --git a/fs/proc/base.c b/fs/proc/base.c index aadab1443..a0a86a0c6 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -47,7 +47,7 @@ * Overall revision about smaps. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/time.h> diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 846b1d785..647f556e0 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -22,7 +22,7 @@ #include <linux/bitops.h> #include <linux/spinlock.h> #include <linux/completion.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 843b8ef04..bf9771bd0 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -25,7 +25,7 @@ #include <linux/magic.h> #include <linux/namei.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 0a22194e5..c80b943e4 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -23,7 +23,7 @@ #include <linux/bootmem.h> #include <linux/init.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/list.h> #include <linux/ioport.h> diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c index bdfabdaef..68f01c2f3 100644 --- a/fs/proc/kmsg.c +++ b/fs/proc/kmsg.c @@ -14,7 +14,7 @@ #include <linux/fs.h> #include <linux/syslog.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> extern wait_queue_head_t log_wait; diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c index 5f9bc8a74..2a50be1e3 100644 --- a/fs/proc/nommu.c +++ b/fs/proc/nommu.c @@ -25,7 +25,7 @@ #include <linux/seq_file.h> #include <linux/hugetlb.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/tlb.h> #include <asm/div64.h> diff --git a/fs/proc/page.c b/fs/proc/page.c index 1a10de230..be424cad7 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -11,7 +11,7 @@ #include <linux/kernel-page-flags.h> #include <linux/swap.h> #include <linux/swapops.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" #define KPMSIZE sizeof(u64) diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index 106a83570..c94105a5f 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c @@ -15,7 +15,7 @@ #include <linux/export.h> #include <linux/slab.h> #include <asm/prom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" static inline void set_node_proc_entry(struct device_node *np, diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c index 986e83220..84fed876f 100644 --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c @@ -8,7 +8,7 @@ * proc net directory handling functions */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/time.h> diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c index cb761f010..f5411e60a 100644 --- a/fs/proc/proc_tty.c +++ b/fs/proc/proc_tty.c @@ -4,7 +4,7 @@ * Copyright 1997, Theodore Ts'o */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/init.h> #include <linux/errno.h> diff --git a/fs/proc/root.c b/fs/proc/root.c index 3df19e6e1..d70aceb48 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -6,7 +6,7 @@ * proc root directory handling functions */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/time.h> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 5368b47ae..490bdcf30 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -14,7 +14,7 @@ #include <linux/swapops.h> #include <asm/elf.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlbflush.h> #include "internal.h" diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 17f7e080d..6c34be5b0 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -20,7 +20,7 @@ #include <linux/init.h> #include <linux/crash_dump.h> #include <linux/list.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include "internal.h" diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index 8d5b438cc..f373839e2 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c @@ -23,7 +23,7 @@ #include <linux/sched.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" static int ramfs_nommu_setattr(struct dentry *, struct iattr *); diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index c24f1e10b..8037d37f8 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c @@ -35,7 +35,7 @@ #include <linux/parser.h> #include <linux/magic.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" #define RAMFS_DEFAULT_MODE 0755 diff --git a/fs/read_write.c b/fs/read_write.c index 559d4ed7d..a7e8a8048 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -19,7 +19,7 @@ #include <linux/compat.h> #include "internal.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> typedef ssize_t (*io_fn_t)(struct file *, char __user *, size_t, loff_t *); diff --git a/fs/readdir.c b/fs/readdir.c index e1b7e1910..5990978c1 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -18,7 +18,7 @@ #include <linux/syscalls.h> #include <linux/unistd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int iterate_dir(struct file *file, struct dir_context *ctx) { diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index 2b96b59f7..a0b20d2b4 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c @@ -9,7 +9,7 @@ #include <linux/stat.h> #include <linux/buffer_head.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern const struct reiserfs_key MIN_KEY; diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c index 2b7882b50..2968a3b26 100644 --- a/fs/reiserfs/do_balan.c +++ b/fs/reiserfs/do_balan.c @@ -15,7 +15,7 @@ ** **/ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/time.h> #include "reiserfs.h" #include <linux/buffer_head.h> diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index dcaafcfc2..178288e87 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c @@ -6,7 +6,7 @@ #include "reiserfs.h" #include "acl.h" #include "xattr.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/pagemap.h> #include <linux/swap.h> #include <linux/writeback.h> diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c index 58cce0c60..c6fa9ec29 100644 --- a/fs/reiserfs/ibalance.c +++ b/fs/reiserfs/ibalance.c @@ -2,7 +2,7 @@ * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/string.h> #include <linux/time.h> #include "reiserfs.h" diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index dd76473b6..3f39d868e 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -11,7 +11,7 @@ #include <linux/pagemap.h> #include <linux/highmem.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> #include <linux/buffer_head.h> #include <linux/mpage.h> diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c index 15cb5fe6b..ddd3c053d 100644 --- a/fs/reiserfs/ioctl.c +++ b/fs/reiserfs/ioctl.c @@ -7,7 +7,7 @@ #include <linux/mount.h> #include "reiserfs.h" #include <linux/time.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/pagemap.h> #include <linux/compat.h> diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c index 79e5a8b4c..c75653223 100644 --- a/fs/reiserfs/lbalance.c +++ b/fs/reiserfs/lbalance.c @@ -2,7 +2,7 @@ * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/string.h> #include <linux/time.h> #include "reiserfs.h" diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c index 1d48974c2..4e6f8e0be 100644 --- a/fs/reiserfs/procfs.c +++ b/fs/reiserfs/procfs.c @@ -11,7 +11,7 @@ #include <linux/module.h> #include <linux/time.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "reiserfs.h" #include <linux/init.h> #include <linux/proc_fs.h> diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 7c8fa8709..773528565 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -15,7 +15,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/time.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "reiserfs.h" #include "acl.h" #include "xattr.h" diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 821bcf70e..01fb06ef7 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -45,7 +45,7 @@ #include <linux/xattr.h> #include "xattr.h" #include "acl.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/checksum.h> #include <linux/stat.h> #include <linux/quotaops.h> diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 2d73589f3..d9e5c287b 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c @@ -9,7 +9,7 @@ #include <linux/posix_acl_xattr.h> #include "xattr.h" #include "acl.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode, int type, diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c index 800a3cef6..e7f8939a4 100644 --- a/fs/reiserfs/xattr_security.c +++ b/fs/reiserfs/xattr_security.c @@ -6,7 +6,7 @@ #include <linux/slab.h> #include "xattr.h" #include <linux/security.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int security_get(struct dentry *dentry, const char *name, void *buffer, size_t size, diff --git a/fs/reiserfs/xattr_trusted.c b/fs/reiserfs/xattr_trusted.c index a0035719f..5eeb0c48b 100644 --- a/fs/reiserfs/xattr_trusted.c +++ b/fs/reiserfs/xattr_trusted.c @@ -5,7 +5,7 @@ #include <linux/pagemap.h> #include <linux/xattr.h> #include "xattr.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int trusted_get(struct dentry *dentry, const char *name, void *buffer, size_t size, diff --git a/fs/reiserfs/xattr_user.c b/fs/reiserfs/xattr_user.c index 8667491ae..e50eab046 100644 --- a/fs/reiserfs/xattr_user.c +++ b/fs/reiserfs/xattr_user.c @@ -4,7 +4,7 @@ #include <linux/pagemap.h> #include <linux/xattr.h> #include "xattr.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int user_get(struct dentry *dentry, const char *name, void *buffer, size_t size, diff --git a/fs/select.c b/fs/select.c index 6b14dc7df..b587a67a1 100644 --- a/fs/select.c +++ b/fs/select.c @@ -29,7 +29,7 @@ #include <linux/sched/rt.h> #include <linux/freezer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* diff --git a/fs/seq_file.c b/fs/seq_file.c index 51f6afcdb..0737db9ad 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -13,7 +13,7 @@ #include <linux/cred.h> #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> @@ -15,7 +15,7 @@ #include <linux/syscalls.h> #include <linux/pagemap.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> void generic_fillattr(struct inode *inode, struct kstat *stat) diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c index 15c68f948..645055490 100644 --- a/fs/sysfs/bin.c +++ b/fs/sysfs/bin.c @@ -23,7 +23,7 @@ #include <linux/mutex.h> #include <linux/mm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sysfs.h" diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 602f56db0..a1b3c728b 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -20,7 +20,7 @@ #include <linux/list.h> #include <linux/mutex.h> #include <linux/limits.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "sysfs.h" diff --git a/fs/udf/file.c b/fs/udf/file.c index 29569dd08..c58592602 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -27,7 +27,7 @@ #include "udfdecl.h" #include <linux/fs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kernel.h> #include <linux/string.h> /* memset */ #include <linux/capability.h> diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c index 6583fe9b0..6ad5a453a 100644 --- a/fs/udf/lowlevel.c +++ b/fs/udf/lowlevel.c @@ -21,7 +21,7 @@ #include <linux/blkdev.h> #include <linux/cdrom.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "udf_sb.h" diff --git a/fs/udf/super.c b/fs/udf/super.c index 2512677a3..82750285d 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -63,7 +63,7 @@ #include "udf_i.h" #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define VDS_POS_PRIMARY_VOL_DESC 0 #define VDS_POS_UNALLOC_SPACE_DESC 1 diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c index 0422b7b83..ac10ca939 100644 --- a/fs/udf/symlink.c +++ b/fs/udf/symlink.c @@ -20,7 +20,7 @@ */ #include "udfdecl.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/fs.h> #include <linux/time.h> diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index ff24e4449..c540ad283 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -25,7 +25,7 @@ * David S. Miller (davem@caip.rutgers.edu), 1995 */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/fs.h> diff --git a/fs/ufs/super.c b/fs/ufs/super.c index b8c6791f0..e0f98ae3f 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -72,7 +72,7 @@ #include <stdarg.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/fs.h> diff --git a/fs/utimes.c b/fs/utimes.c index 7216a079d..a20b5c144 100644 --- a/fs/utimes.c +++ b/fs/utimes.c @@ -8,7 +8,7 @@ #include <linux/stat.h> #include <linux/utime.h> #include <linux/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #ifdef __ARCH_WANT_SYS_UTIME diff --git a/fs/xattr.c b/fs/xattr.c index bc6b3cc90..6a1150aab 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -22,7 +22,7 @@ #include <linux/vmalloc.h> #include <linux/posix_acl_xattr.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Check permissions for extended attribute access. This is a bit complicated diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c index 68799d7f0..f16fc5075 100644 --- a/fs/xfs/xfs_ioctl32.c +++ b/fs/xfs/xfs_ioctl32.c @@ -19,7 +19,7 @@ #include <linux/ioctl.h> #include <linux/mount.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "xfs.h" #include "xfs_fs.h" #include "xfs_log.h" diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 800f896a6..016a44895 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -77,7 +77,7 @@ #include <asm/page.h> #include <asm/div64.h> #include <asm/param.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <asm/unaligned.h> diff --git a/include/asm-generic/termios-base.h b/include/asm-generic/termios-base.h index 0a769feb2..157bbf6f4 100644 --- a/include/asm-generic/termios-base.h +++ b/include/asm-generic/termios-base.h @@ -4,7 +4,7 @@ #ifndef _ASM_GENERIC_TERMIOS_BASE_H #define _ASM_GENERIC_TERMIOS_BASE_H -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifndef __ARCH_TERMIO_GETPUT diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h index 4fa6fe0fc..8c13a16b0 100644 --- a/include/asm-generic/termios.h +++ b/include/asm-generic/termios.h @@ -2,7 +2,7 @@ #define _ASM_GENERIC_TERMIOS_H -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <uapi/asm-generic/termios.h> /* intr=^C quit=^\ erase=del kill=^U diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 63d17ee9e..78bde953e 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -61,7 +61,7 @@ #endif #include <asm/io.h> #include <asm/mman.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_MTRR #include <asm/mtrr.h> #endif diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h index 0fc6ff276..8d80fdc68 100644 --- a/include/linux/isdnif.h +++ b/include/linux/isdnif.h @@ -500,6 +500,6 @@ typedef struct { * */ extern int register_isdn(isdn_if*); -#include <asm/uaccess.h> +#include <linux/uaccess.h> #endif /* __ISDNIF_H__ */ diff --git a/include/linux/kpd.h b/include/linux/kpd.h index 947fb65d3..175fc04a6 100644 --- a/include/linux/kpd.h +++ b/include/linux/kpd.h @@ -42,7 +42,7 @@ #endif #include <asm/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <mach/hal_pub_kpd.h> diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 3b3b58a30..f9b069d66 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -9,7 +9,7 @@ #include <linux/list.h> #include <linux/highmem.h> #include <linux/compiler.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/gfp.h> #include <linux/bitops.h> #include <linux/hardirq.h> /* for in_interrupt() */ diff --git a/include/linux/poll.h b/include/linux/poll.h index c08386fb3..a13b6c1c7 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h @@ -8,7 +8,7 @@ #include <linux/string.h> #include <linux/fs.h> #include <linux/sysctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <uapi/linux/poll.h> extern struct ctl_table epoll_table[]; /* for sysctl */ diff --git a/include/net/checksum.h b/include/net/checksum.h index 600d1d705..c639841b9 100644 --- a/include/net/checksum.h +++ b/include/net/checksum.h @@ -22,7 +22,7 @@ #include <linux/errno.h> #include <asm/types.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/checksum.h> #ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index ee81c68f2..144725c14 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -76,7 +76,7 @@ #include <net/ip6_route.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/page.h> #include <net/sock.h> #include <net/snmp.h> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 98cc4b29f..b1dc672b7 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -50,7 +50,7 @@ #include <linux/workqueue.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> extern struct workqueue_struct *ib_wq; diff --git a/include/sound/mt_auddrv_devtree_parser.h b/include/sound/mt_auddrv_devtree_parser.h index fee238776..529e45167 100644 --- a/include/sound/mt_auddrv_devtree_parser.h +++ b/include/sound/mt_auddrv_devtree_parser.h @@ -66,7 +66,7 @@ #include <linux/proc_fs.h> #include <linux/string.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/module.h> diff --git a/init/init_task.c b/init/init_task.c index ba0a7f362..a6872aedd 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -9,7 +9,7 @@ #include <linux/mm.h> #include <asm/pgtable.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); diff --git a/ipc/compat.c b/ipc/compat.c index d3b376025..d6ff668ee 100644 --- a/ipc/compat.c +++ b/ipc/compat.c @@ -30,7 +30,7 @@ #include <linux/ptrace.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "util.h" diff --git a/ipc/compat_mq.c b/ipc/compat_mq.c index 380ea4fe0..4288cb754 100644 --- a/ipc/compat_mq.c +++ b/ipc/compat_mq.c @@ -12,7 +12,7 @@ #include <linux/mqueue.h> #include <linux/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct compat_mq_attr { compat_long_t mq_flags; /* message queue flags */ @@ -39,7 +39,7 @@ #include <linux/ipc_namespace.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "util.h" /* @@ -87,7 +87,7 @@ #include <linux/nsproxy.h> #include <linux/ipc_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "util.h" /* One semaphore structure for each semaphore in the system. */ @@ -43,7 +43,7 @@ #include <linux/mount.h> #include <linux/ipc_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "util.h" diff --git a/kernel/acct.c b/kernel/acct.c index 8d6e14513..df2851905 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -55,7 +55,7 @@ #include <linux/times.h> #include <linux/syscalls.h> #include <linux/mount.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/div64.h> #include <linux/blkdev.h> /* sector_div */ #include <linux/pid_namespace.h> diff --git a/kernel/capability.c b/kernel/capability.c index 1339806a8..74c2030b2 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -15,7 +15,7 @@ #include <linux/syscalls.h> #include <linux/pid_namespace.h> #include <linux/user_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Leveraged for setting/resetting capabilities diff --git a/kernel/compat.c b/kernel/compat.c index 0a09e481b..34bec060f 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -28,7 +28,7 @@ #include <linux/ptrace.h> #include <linux/gfp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Get/set struct timeval with struct timespec on the native side diff --git a/kernel/configs.c b/kernel/configs.c index c18b1f1ae..2df132b20 100644 --- a/kernel/configs.c +++ b/kernel/configs.c @@ -28,7 +28,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /**************************************************/ /* the actual current config file */ diff --git a/kernel/cpuset.c b/kernel/cpuset.c index d384b9d21..dbe558161 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -54,7 +54,7 @@ #include <linux/backing-dev.h> #include <linux/sort.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include <linux/mutex.h> #include <linux/workqueue.h> diff --git a/kernel/exit.c b/kernel/exit.c index 11f99c785..102ec4376 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -54,7 +54,7 @@ #include <linux/writeback.h> #include <linux/shm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/pgtable.h> #include <asm/mmu_context.h> diff --git a/kernel/extable.c b/kernel/extable.c index 5ec4b6f86..66d3a4e2a 100644 --- a/kernel/extable.c +++ b/kernel/extable.c @@ -22,7 +22,7 @@ #include <linux/init.h> #include <asm/sections.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * mutex protecting text section modification (dynamic code patching). diff --git a/kernel/fork.c b/kernel/fork.c index 23751af3f..b4fabfba6 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -74,7 +74,7 @@ #include <asm/pgtable.h> #include <asm/pgalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index 3888617a1..e76b1319d 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c @@ -13,7 +13,7 @@ #include <linux/ptrace.h> #include <linux/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* diff --git a/kernel/groups.c b/kernel/groups.c index 67b4ba304..1ea5d895e 100644 --- a/kernel/groups.c +++ b/kernel/groups.c @@ -7,7 +7,7 @@ #include <linux/security.h> #include <linux/syscalls.h> #include <linux/user_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* init to 2 - one for init_task, one to ensure it is never freed */ struct group_info init_groups = { .usage = ATOMIC_INIT(2) }; diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 9268fee2f..fe875c8a2 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -49,7 +49,7 @@ #include <linux/timer.h> #include <linux/freezer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <trace/events/timer.h> diff --git a/kernel/itimer.c b/kernel/itimer.c index 8d262b467..a7a61bca6 100644 --- a/kernel/itimer.c +++ b/kernel/itimer.c @@ -14,7 +14,7 @@ #include <linux/hrtimer.h> #include <trace/events/timer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /** * itimer_get_remtime - get remaining time for the timer diff --git a/kernel/kexec.c b/kernel/kexec.c index 1f8d9382d..3e180b806 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -34,7 +34,7 @@ #include <linux/syscore_ops.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/sections.h> diff --git a/kernel/kmod.c b/kernel/kmod.c index 09d9df4e3..dfc92c046 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -39,7 +39,7 @@ #include <linux/rwsem.h> #include <linux/ptrace.h> #include <linux/async.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <trace/events/module.h> diff --git a/kernel/kprobes.c b/kernel/kprobes.c index bddf3b201..b7ede3541 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -52,7 +52,7 @@ #include <asm-generic/sections.h> #include <asm/cacheflush.h> #include <asm/errno.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define KPROBE_HASH_BITS 6 #define KPROBE_TABLE_SIZE (1 << KPROBE_HASH_BITS) diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c index b2c71c587..172120278 100644 --- a/kernel/lockdep_proc.c +++ b/kernel/lockdep_proc.c @@ -18,7 +18,7 @@ #include <linux/debug_locks.h> #include <linux/vmalloc.h> #include <linux/sort.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/div64.h> #include "lockdep_internals.h" diff --git a/kernel/module.c b/kernel/module.c index 36df6184e..984a935f1 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -47,7 +47,7 @@ #include <linux/string.h> #include <linux/mutex.h> #include <linux/rculist.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #include <asm/mmu_context.h> #include <linux/license.h> diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index 42670e9b4..e93fc9e9e 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -6,7 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> #include <linux/math64.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/kernel_stat.h> #include <trace/events/timer.h> #include <linux/random.h> diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 77e6b83c0..492cb3ddd 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -36,7 +36,7 @@ #include <linux/time.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/list.h> #include <linux/init.h> #include <linux/compiler.h> diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index e16ba8344..02842daa4 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -28,7 +28,7 @@ #include <linux/list.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/tlbflush.h> diff --git a/kernel/power/user.c b/kernel/power/user.c index 793144d2c..516061ca8 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -26,7 +26,7 @@ #include <linux/cpu.h> #include <linux/freezer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "power.h" diff --git a/kernel/printk.c b/kernel/printk.c index 90cbed2cb..079d61468 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -50,7 +50,7 @@ #include <linux/mt_sched_mon.h> #include <linux/aee.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define CREATE_TRACE_POINTS #include <trace/events/printk.h> diff --git a/kernel/profile.c b/kernel/profile.c index 6631e1ef5..379cbae7d 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -422,7 +422,7 @@ void profile_tick(int type) #ifdef CONFIG_PROC_FS #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int prof_cpu_mask_proc_show(struct seq_file *m, void *v) { diff --git a/kernel/signal.c b/kernel/signal.c index 28db04b54..e91d9656a 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -37,7 +37,7 @@ #include <trace/events/signal.h> #include <asm/param.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/siginfo.h> #include <asm/cacheflush.h> diff --git a/kernel/sys.c b/kernel/sys.c index cb64e51f7..fdcbab92d 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -61,7 +61,7 @@ /* Move somewhere else to avoid recompiling? */ #include <generated/utsrelease.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/unistd.h> diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 0b6678a6b..63ad2ac67 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -63,7 +63,7 @@ #include <linux/binfmts.h> #include <linux/sched/sysctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/processor.h> #ifdef CONFIG_X86 diff --git a/kernel/time.c b/kernel/time.c index 5d4d9a024..283e54821 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -38,7 +38,7 @@ #include <linux/math64.h> #include <linux/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <mach/mt_ccci_common.h> diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c index 4838ad708..bacac1415 100644 --- a/kernel/time/timer_list.c +++ b/kernel/time/timer_list.c @@ -18,7 +18,7 @@ #include <linux/kallsyms.h> #include <linux/tick.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct timer_list_iter { diff --git a/kernel/timer.c b/kernel/timer.c index 9d5ceddde..f3734e106 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -43,7 +43,7 @@ #include <linux/slab.h> #include <linux/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/div64.h> #include <asm/timex.h> diff --git a/kernel/uid16.c b/kernel/uid16.c index d58cc4d8f..ea518fa05 100644 --- a/kernel/uid16.c +++ b/kernel/uid16.c @@ -14,7 +14,7 @@ #include <linux/security.h> #include <linux/syscalls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> SYSCALL_DEFINE3(chown16, const char __user *, filename, old_uid_t, user, old_gid_t, group) { diff --git a/lib/bitmap.c b/lib/bitmap.c index 016096be9..fc2c7d209 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -12,7 +12,7 @@ #include <linux/bitmap.h> #include <linux/bitops.h> #include <linux/bug.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * bitmaps provide an array of bits, implemented using an an diff --git a/lib/extable.c b/lib/extable.c index 4cac81ec2..13228f4c6 100644 --- a/lib/extable.c +++ b/lib/extable.c @@ -12,7 +12,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/sort.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifndef ARCH_HAS_SORT_EXTABLE /* diff --git a/lib/kstrtox.c b/lib/kstrtox.c index f78ae0c0c..2f1c142db 100644 --- a/lib/kstrtox.c +++ b/lib/kstrtox.c @@ -17,7 +17,7 @@ #include <linux/math64.h> #include <linux/export.h> #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "kstrtox.h" const char *_parse_integer_fixup_radix(const char *s, unsigned int *base) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7f9608355..bd36b35bf 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -59,7 +59,7 @@ #include <net/ip.h> #include <net/tcp_memcontrol.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <trace/events/vmscan.h> diff --git a/mm/memory.c b/mm/memory.c index 8c6271aa1..a59ca8b28 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -62,7 +62,7 @@ #include <asm/io.h> #include <asm/pgalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlb.h> #include <asm/tlbflush.h> #include <asm/pgtable.h> diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 783021814..18e14dc67 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -93,7 +93,7 @@ #include <linux/mmu_notifier.h> #include <asm/tlbflush.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/random.h> #include "internal.h" diff --git a/mm/mincore.c b/mm/mincore.c index da2be56a7..51d46e5d5 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -16,7 +16,7 @@ #include <linux/swapops.h> #include <linux/hugetlb.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> static void mincore_hugetlb_page_range(struct vm_area_struct *vma, @@ -37,7 +37,7 @@ #include <linux/notifier.h> #include <linux/memory.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #include <asm/tlb.h> #include <asm/mmu_context.h> diff --git a/mm/mprotect.c b/mm/mprotect.c index 3c44c971f..3d7d38286 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -23,7 +23,7 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> #include <linux/perf_event.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> diff --git a/mm/mremap.c b/mm/mremap.c index 2201d060c..e04b337ee 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -21,7 +21,7 @@ #include <linux/mmu_notifier.h> #include <linux/sched/sysctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> diff --git a/mm/nommu.c b/mm/nommu.c index d9d07a5d2..0f285070c 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -31,7 +31,7 @@ #include <linux/audit.h> #include <linux/sched/sysctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlb.h> #include <asm/tlbflush.h> #include <asm/mmu_context.h> diff --git a/mm/shmem.c b/mm/shmem.c index 3285c2e44..cf0047a48 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -67,7 +67,7 @@ static struct vfsmount *shm_mnt; #include <linux/seq_file.h> #include <linux/magic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #define BLOCKS_PER_PAGE (PAGE_CACHE_SIZE/512) @@ -8,7 +8,7 @@ #include <linux/swap.h> #include <linux/swapops.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 61586f578..277f7f481 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -28,7 +28,7 @@ #include <linux/kmemleak.h> #include <linux/atomic.h> #include <linux/llist.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/tlbflush.h> #include <asm/shmparam.h> diff --git a/net/802/fc.c b/net/802/fc.c index 05eea6b98..e4317a377 100644 --- a/net/802/fc.c +++ b/net/802/fc.c @@ -10,7 +10,7 @@ * v 1.0 03/22/99 */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/string.h> diff --git a/net/802/hippi.c b/net/802/hippi.c index 51a1f5304..798b0f126 100644 --- a/net/802/hippi.c +++ b/net/802/hippi.c @@ -34,7 +34,7 @@ #include <linux/errno.h> #include <net/arp.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Create the HIPPI MAC header for an arbitrary protocol layer diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 82fdb3515..d7aa85af5 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -34,7 +34,7 @@ #include <net/rtnetlink.h> #include <net/net_namespace.h> #include <net/netns/generic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/if_vlan.h> #include "vlan.h" diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 69940a723..294a45d4f 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -32,7 +32,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/termios.h> /* For TIOCINQ/OUTQ */ #include <linux/mm.h> diff --git a/net/ax25/ax25_addr.c b/net/ax25/ax25_addr.c index e7c9b0ea1..ac2542b7b 100644 --- a/net/ax25/ax25_addr.c +++ b/net/ax25/ax25_addr.c @@ -21,7 +21,7 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c index 3d106767b..9a3a301e1 100644 --- a/net/ax25/ax25_dev.c +++ b/net/ax25/ax25_dev.c @@ -23,7 +23,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_ds_in.c b/net/ax25/ax25_ds_in.c index 9bd31e88a..891596e74 100644 --- a/net/ax25/ax25_ds_in.c +++ b/net/ax25/ax25_ds_in.c @@ -22,7 +22,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c index e05bd57b5..28827e81b 100644 --- a/net/ax25/ax25_ds_subr.c +++ b/net/ax25/ax25_ds_subr.c @@ -23,7 +23,7 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_ds_timer.c b/net/ax25/ax25_ds_timer.c index 951cd57bb..d2feead19 100644 --- a/net/ax25/ax25_ds_timer.c +++ b/net/ax25/ax25_ds_timer.c @@ -24,7 +24,7 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c index 7f16e8a93..8c07c2856 100644 --- a/net/ax25/ax25_iface.c +++ b/net/ax25/ax25_iface.c @@ -23,7 +23,7 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 96f4cab3a..f29b6f674 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -26,7 +26,7 @@ #include <linux/netfilter.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c index 67de6b33f..80861a0be 100644 --- a/net/ax25/ax25_ip.c +++ b/net/ax25/ax25_ip.c @@ -23,7 +23,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/termios.h> /* For TIOCINQ/OUTQ */ #include <linux/mm.h> diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c index be2acab9b..273c13f3f 100644 --- a/net/ax25/ax25_out.c +++ b/net/ax25/ax25_out.c @@ -26,7 +26,7 @@ #include <linux/skbuff.h> #include <linux/netfilter.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c index d39097737..e1fda27cb 100644 --- a/net/ax25/ax25_route.c +++ b/net/ax25/ax25_route.c @@ -31,7 +31,7 @@ #include <linux/skbuff.h> #include <linux/spinlock.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_std_in.c b/net/ax25/ax25_std_in.c index 3fbf8f7b2..8632b86e8 100644 --- a/net/ax25/ax25_std_in.c +++ b/net/ax25/ax25_std_in.c @@ -29,7 +29,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_std_subr.c b/net/ax25/ax25_std_subr.c index 8b66a41e5..94bd06396 100644 --- a/net/ax25/ax25_std_subr.c +++ b/net/ax25/ax25_std_subr.c @@ -20,7 +20,7 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_std_timer.c b/net/ax25/ax25_std_timer.c index 004467c9e..42a365657 100644 --- a/net/ax25/ax25_std_timer.c +++ b/net/ax25/ax25_std_timer.c @@ -24,7 +24,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c index 1997538a5..24bf9af4b 100644 --- a/net/ax25/ax25_subr.c +++ b/net/ax25/ax25_subr.c @@ -25,7 +25,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c index c3cffa79b..23a6f38a8 100644 --- a/net/ax25/ax25_timer.c +++ b/net/ax25/ax25_timer.c @@ -28,7 +28,7 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c index 71c4badbc..803389604 100644 --- a/net/ax25/ax25_uid.c +++ b/net/ax25/ax25_uid.c @@ -25,7 +25,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 239e0e84f..40c651fad 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -19,7 +19,7 @@ #include <linux/list.h> #include <linux/netfilter_bridge.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "br_private.h" /* net device transmit always called with BH disabled */ diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index a882db499..e06bb32fa 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/times.h> #include <net/net_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "br_private.h" static int get_bridge_ifindices(struct net *net, int *indices, int num) diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 1ed75bfd8..39e030350 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -36,7 +36,7 @@ #include <net/ipv6.h> #include <net/route.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "br_private.h" #ifdef CONFIG_SYSCTL #include <linux/sysctl.h> diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index d37753914..4fb1817a6 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -23,7 +23,7 @@ #include <linux/spinlock.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/smp.h> #include <linux/cpumask.h> #include <net/sock.h> diff --git a/net/compat.c b/net/compat.c index d12529050..67dac1d65 100644 --- a/net/compat.c +++ b/net/compat.c @@ -28,7 +28,7 @@ #include <net/sock.h> #include <net/ip.h> #include <net/ipv6.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/compat.h> static inline int iov_from_user_compat_to_kern(struct iovec *kiov, diff --git a/net/core/datagram.c b/net/core/datagram.c index ed5ffb6ae..be0623612 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -36,7 +36,7 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/kernel.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/errno.h> diff --git a/net/core/dev.c b/net/core/dev.c index d57d545eb..671fa91ea 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -72,7 +72,7 @@ * - netif_rx() feedback */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/capability.h> #include <linux/cpu.h> diff --git a/net/core/filter.c b/net/core/filter.c index 65f2a65b5..1e2e83cec 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -33,7 +33,7 @@ #include <net/sock.h> #include <linux/errno.h> #include <linux/timer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> #include <linux/filter.h> #include <linux/ratelimit.h> diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c index d9d198aa9..c7ca6ada0 100644 --- a/net/core/gen_estimator.c +++ b/net/core/gen_estimator.c @@ -13,7 +13,7 @@ * names to make it usable in general net subsystem. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/module.h> #include <linux/types.h> diff --git a/net/core/iovec.c b/net/core/iovec.c index 7fc51422d..24fe6d027 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -22,7 +22,7 @@ #include <linux/mm.h> #include <linux/net.h> #include <linux/in6.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <net/checksum.h> #include <net/sock.h> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 62e64219a..fd0626572 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -39,7 +39,7 @@ #include <linux/pci.h> #include <linux/etherdevice.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/inet.h> #include <linux/netdevice.h> diff --git a/net/core/scm.c b/net/core/scm.c index 7a6cf8351..2e56ed125 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -29,7 +29,7 @@ #include <linux/nsproxy.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/protocol.h> #include <linux/skbuff.h> diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 05195b8c8..8a5c11636 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -69,7 +69,7 @@ #include <net/checksum.h> #include <net/xfrm.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <trace/events/skb.h> #include <linux/highmem.h> diff --git a/net/core/sock.c b/net/core/sock.c index a1e933bfc..668033721 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -117,7 +117,7 @@ #include <linux/memcontrol.h> #include <linux/prefetch.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/netdevice.h> #include <net/protocol.h> diff --git a/net/core/utils.c b/net/core/utils.c index aa88e23fc..03fe593b9 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -31,7 +31,7 @@ #include <net/net_ratelimit.h> #include <asm/byteorder.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> int net_msg_warn __read_mostly = 1; EXPORT_SYMBOL(net_msg_warn); diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index b5e52100a..7c84cd672 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c @@ -41,7 +41,7 @@ #include <linux/sysctl.h> #include <linux/notifier.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/net_namespace.h> #include <net/neighbour.h> #include <net/dst.h> diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index d332aefb0..ba35bf982 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c @@ -31,7 +31,7 @@ #include <linux/timer.h> #include <linux/spinlock.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/neighbour.h> #include <net/dst.h> #include <net/flow.h> diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 86e380705..db064940b 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c @@ -25,7 +25,7 @@ #include <linux/timer.h> #include <linux/spinlock.h> #include <linux/atomic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/route.h> /* RTF_xxx */ #include <net/neighbour.h> #include <net/netlink.h> diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c index a55eeccaa..12e32da8b 100644 --- a/net/decnet/sysctl_net_decnet.c +++ b/net/decnet/sysctl_net_decnet.c @@ -22,7 +22,7 @@ #include <net/dst.h> #include <net/flow.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/dn.h> #include <net/dn_dev.h> diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 535956092..1efb53b11 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -58,7 +58,7 @@ #include <net/ipv6.h> #include <net/ip.h> #include <net/dsa.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> __setup("ether=", netdev_boot_setup); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 199ad8314..cdb4d75ef 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -91,7 +91,7 @@ #include <linux/slab.h> #include <linux/netfilter/xt_qtaguid.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/inet.h> #include <linux/igmp.h> diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index ee3c309ef..99d933a4c 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -26,7 +26,7 @@ */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/capability.h> #include <linux/module.h> diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index aefca8fd9..fe6b1ec7f 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -14,7 +14,7 @@ */ #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/capability.h> #include <linux/types.h> diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index d00d8f965..76b3e9a49 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -13,7 +13,7 @@ * 2 of the License, or (at your option) any later version. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/types.h> #include <linux/kernel.h> diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 459dbd3ec..1360046a9 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -50,7 +50,7 @@ #define VERSION "0.409" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/types.h> #include <linux/kernel.h> diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index b0af6e336..af8a15edf 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -91,7 +91,7 @@ #include <linux/errno.h> #include <linux/timer.h> #include <linux/init.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/checksum.h> #include <net/xfrm.h> #include <net/inet_common.h> diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 4572ee7c7..87c2b46f4 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -72,7 +72,7 @@ #include <linux/module.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/jiffies.h> diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index fae5a8459..684fbd921 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -17,7 +17,7 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/skbuff.h> #include <linux/netdevice.h> #include <linux/in.h> diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 089ed81d1..777bc90e1 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -15,7 +15,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/types.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> #include <linux/skbuff.h> #include <linux/ip.h> diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 1204570dc..fdbe72f11 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -42,7 +42,7 @@ * Hirokazu Takahashi: sendfile() on UDP works now. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/types.h> #include <linux/kernel.h> diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 3d009e174..7fa5485bb 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -43,7 +43,7 @@ #include <net/ip_fib.h> #include <linux/errqueue.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define IP_CMSG_PKTINFO 1 #define IP_CMSG_TTL 2 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index efa1138fa..f8baec094 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -61,7 +61,7 @@ #include <net/ipconfig.h> #include <net/route.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/checksum.h> #include <asm/processor.h> diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 897b784e9..a950288cc 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -96,7 +96,7 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/skbuff.h> #include <linux/netdevice.h> #include <linux/in.h> diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 91941b0b6..9857e938e 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -26,7 +26,7 @@ * */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/types.h> #include <linux/capability.h> #include <linux/errno.h> diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c index 54ac00b4e..836b81c13 100644 --- a/net/ipv4/netfilter/arp_tables.c +++ b/net/ipv4/netfilter/arp_tables.c @@ -24,7 +24,7 @@ #include <linux/err.h> #include <net/compat.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/netfilter/x_tables.h> #include <linux/netfilter_arp/arp_tables.h> diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 2d00a0016..5887db737 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c @@ -20,7 +20,7 @@ #include <linux/icmp.h> #include <net/ip.h> #include <net/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mutex.h> #include <linux/proc_fs.h> #include <linux/err.h> diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 3bc80c7fb..5af5ee7b9 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -41,7 +41,7 @@ #include <linux/atomic.h> #include <asm/byteorder.h> #include <asm/current.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ioctls.h> #include <linux/stddef.h> #include <linux/slab.h> diff --git a/net/ipv4/route.c b/net/ipv4/route.c index a048947f6..9837b033d 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -65,7 +65,7 @@ #define pr_fmt(fmt) "IPv4: " fmt #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/bitops.h> #include <linux/types.h> #include <linux/kernel.h> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b990fc660..aeacce9e4 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -281,7 +281,7 @@ #include <net/netdma.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ioctls.h> int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT; diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index a9d2cb431..027fe608b 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -79,7 +79,7 @@ #define pr_fmt(fmt) "UDP: " fmt -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ioctls.h> #include <linux/bootmem.h> #include <linux/highmem.h> diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index db3b20e10..8ec1bb576 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -60,7 +60,7 @@ #include <net/ip6_tunnel.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mroute6.h> #ifdef CONFIG_ANDROID_PARANOID_NETWORK diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 0a3605e29..75067fa0b 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -33,7 +33,7 @@ #include <net/dsfield.h> #include <linux/errqueue.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static bool ipv6_mapped_addr_any(const struct in6_addr *a) { diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 33dbd6c1a..215c95de8 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -47,7 +47,7 @@ #include <net/xfrm.h> #endif -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * Parsing tlv encoded headers. diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index b0220040e..8fdfb835c 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -68,7 +68,7 @@ #include <net/xfrm.h> #include <net/inet_common.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /* * The ICMP socket(s). This is the most convenient way to flow control diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index f0ccdb787..5b52dfcaf 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -36,7 +36,7 @@ #include <net/icmp.h> #include <net/transp_v6.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #define FL_MIN_LINGER 6 /* Minimal linger. It is set to 6sec specified in old IPv6 RFC. Well, it was reasonable value. diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index cd0a8bed1..2f03ffd28 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -42,7 +42,7 @@ #include <linux/slab.h> #include <linux/hash.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/atomic.h> #include <net/icmp.h> diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 13d47e177..dfe493024 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -16,7 +16,7 @@ * */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/types.h> #include <linux/sched.h> #include <linux/errno.h> diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index f4d2412d9..faf4fc8d3 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -53,7 +53,7 @@ #include <net/xfrm.h> #include <net/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> struct ip6_ra_chain *ip6_ra_chain; DEFINE_RWLOCK(ip6_ra_lock); diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 67c0892da..9fb727ee1 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -21,7 +21,7 @@ #include <linux/icmpv6.h> #include <net/ipv6.h> #include <net/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/mutex.h> #include <linux/proc_fs.h> #include <linux/err.h> diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index d879772d9..7345fed1d 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -32,7 +32,7 @@ #include <linux/netfilter_ipv6.h> #include <linux/skbuff.h> #include <linux/compat.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ioctls.h> #include <net/net_namespace.h> diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 3be5fbdbd..b91765728 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -59,7 +59,7 @@ #include <net/netlink.h> #include <net/nexthop.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_SYSCTL #include <linux/sysctl.h> diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index d9535bb8f..92fbc8755 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -31,7 +31,7 @@ #include <linux/if_arp.h> #include <linux/icmp.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/init.h> #include <linux/netfilter_ipv4.h> #include <linux/if_ether.h> diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index fe760bb2c..68a848586 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -64,7 +64,7 @@ #include <net/secure_seq.h> #include <net/tcp_memcontrol.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index e4d286dae..d557ef018 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -35,7 +35,7 @@ #include <linux/module.h> #include <linux/skbuff.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/ndisc.h> #include <net/protocol.h> diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index f86f096aa..81324e8ea 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c @@ -54,7 +54,7 @@ #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #ifdef CONFIG_SYSCTL extern void ipx_register_sysctl(void); diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index c5fdb89b7..41d93ad1c 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -54,7 +54,7 @@ #include <linux/poll.h> #include <asm/ioctls.h> /* TIOCOUTQ, TIOCINQ */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/sock.h> #include <net/tcp_states.h> diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 2ee29ed13..a51cb4815 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c @@ -42,7 +42,7 @@ #include <linux/interrupt.h> #include <linux/device.h> /* for MODULE_ALIAS_CHARDEV_MAJOR */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/irda/irda.h> #include <net/irda/irmod.h> diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c index b343f50dc..73744a9b8 100644 --- a/net/irda/ircomm/ircomm_tty_ioctl.c +++ b/net/irda/ircomm/ircomm_tty_ioctl.c @@ -34,7 +34,7 @@ #include <linux/tty.h> #include <linux/serial.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/irda/irda.h> #include <net/irda/irmod.h> diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c index 14653b8d6..ec0ec148c 100644 --- a/net/irda/irda_device.c +++ b/net/irda/irda_device.c @@ -45,7 +45,7 @@ #include <linux/export.h> #include <asm/ioctls.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/dma.h> #include <asm/io.h> diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index 564eb0b8a..9a6deff8a 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h @@ -250,7 +250,7 @@ #include <linux/capability.h> #include <linux/ctype.h> /* isspace() */ #include <linux/string.h> /* skip_spaces() */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/init.h> #include <linux/ppp_defs.h> diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index 3cdaa046c..fcca7ac68 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c @@ -33,7 +33,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c index 5dba89913..ee4b35147 100644 --- a/net/lapb/lapb_in.c +++ b/net/lapb/lapb_in.c @@ -31,7 +31,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c index ba4d015bd..97041435d 100644 --- a/net/lapb/lapb_out.c +++ b/net/lapb/lapb_out.c @@ -29,7 +29,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c index 9d0a426ec..62319a837 100644 --- a/net/lapb/lapb_subr.c +++ b/net/lapb/lapb_subr.c @@ -28,7 +28,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 54563ad8a..125f8700a 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c @@ -29,7 +29,7 @@ #include <linux/inet.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index abbd74a4f..a5cc0c43e 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -48,7 +48,7 @@ #include <net/sock.h> #include <net/genetlink.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/ip_vs.h> diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 0a03662bf..5be20cc07 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -22,7 +22,7 @@ #include <linux/sockios.h> #include <linux/net.h> #include <linux/skbuff.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <net/sock.h> #include <linux/init.h> diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 2c1c841f0..3af92c267 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -40,7 +40,7 @@ #include <linux/net.h> #include <linux/fs.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/skbuff.h> #include <linux/netdevice.h> #include <linux/rtnetlink.h> diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 13b92982a..fd2a51a31 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -30,7 +30,7 @@ #include <linux/skbuff.h> #include <net/net_namespace.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/termios.h> /* For TIOCINQ/OUTQ */ #include <linux/mm.h> diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 743262bec..adbc5116a 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c @@ -21,7 +21,7 @@ #include <linux/if_ether.h> /* For the statistics structure. */ #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/inet.h> diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c index c3073a2ef..80dbd0beb 100644 --- a/net/netrom/nr_in.c +++ b/net/netrom/nr_in.c @@ -23,7 +23,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/netrom/nr_out.c b/net/netrom/nr_out.c index 0b4bcb2bf..00fbf1419 100644 --- a/net/netrom/nr_out.c +++ b/net/netrom/nr_out.c @@ -22,7 +22,7 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index b976d5eff..96b64d2f6 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -25,7 +25,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/termios.h> /* For TIOCINQ/OUTQ */ #include <linux/mm.h> diff --git a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c index ca40e2298..029c8bb90 100644 --- a/net/netrom/nr_subr.c +++ b/net/netrom/nr_subr.c @@ -22,7 +22,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c index ff2c1b142..94d05806a 100644 --- a/net/netrom/nr_timer.c +++ b/net/netrom/nr_timer.c @@ -23,7 +23,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index d4663f4c2..47016e0fc 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -73,7 +73,7 @@ #include <net/sock.h> #include <linux/errno.h> #include <linux/timer.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ioctls.h> #include <asm/page.h> #include <asm/cacheflush.h> diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 27e689670..5670904e1 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -34,7 +34,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/termios.h> #include <linux/mm.h> diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index 40148932c..8ce3b6164 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c @@ -25,7 +25,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/termios.h> /* For TIOCINQ/OUTQ */ #include <linux/mm.h> diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index ceb8f8497..206a755dc 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -78,7 +78,7 @@ #include <net/inet_ecn.h> #include <net/sctp/sctp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static inline int sctp_v6_addr_match_len(union sctp_addr *s1, union sctp_addr *s2); diff --git a/net/socket.c b/net/socket.c index ea9b1626c..925111ba8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -89,7 +89,7 @@ #include <linux/slab.h> #include <linux/xattr.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unistd.h> #include <net/compat.h> diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index fc2f78d6a..1280cef67 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -50,7 +50,7 @@ #include <linux/workqueue.h> #include <linux/sunrpc/rpc_pipe_fs.h> #include <linux/sunrpc/gss_api.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "../netns.h" diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index a4266b9b2..e2fbf5a9f 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -20,7 +20,7 @@ #include <linux/list.h> #include <linux/module.h> #include <linux/ctype.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/poll.h> #include <linux/seq_file.h> #include <linux/proc_fs.h> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 5c62c5e89..5faeec296 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -41,7 +41,7 @@ #include <net/ipv6.h> #include <net/tcp.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ioctls.h> #include <trace/events/skb.h> diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index af7d339ad..c87f48674 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c @@ -14,7 +14,7 @@ #include <linux/sysctl.h> #include <linux/module.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/sunrpc/types.h> #include <linux/sunrpc/sched.h> #include <linux/sunrpc/stats.h> diff --git a/net/tipc/core.h b/net/tipc/core.h index 0207db041..e6d82ef63 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h @@ -47,7 +47,7 @@ #include <linux/mm.h> #include <linux/timer.h> #include <linux/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/interrupt.h> #include <linux/atomic.h> #include <asm/hardirq.h> diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 184342f13..842590f1a 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -98,7 +98,7 @@ #include <linux/in.h> #include <linux/fs.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/skbuff.h> #include <linux/netdevice.h> #include <net/net_namespace.h> diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index f96af3b96..eeea7b9ad 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -49,7 +49,7 @@ #include <linux/slab.h> #include <net/sock.h> #include <net/tcp_states.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/fcntl.h> #include <linux/termios.h> /* For TIOCINQ/OUTQ */ #include <linux/notifier.h> diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c index 4acacf3c6..a88bcd7d2 100644 --- a/net/x25/x25_link.c +++ b/net/x25/x25_link.c @@ -27,7 +27,7 @@ #include <linux/slab.h> #include <linux/netdevice.h> #include <linux/skbuff.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/init.h> #include <net/x25.h> diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 05b9dbb7e..7475648f8 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -20,7 +20,7 @@ #include <linux/module.h> #include <linux/cache.h> #include <linux/audit.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/ktime.h> #include <linux/slab.h> #include <linux/interrupt.h> diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 7e272ff93..3e05b35e4 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -27,7 +27,7 @@ #include <net/xfrm.h> #include <net/netlink.h> #include <net/ah.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #if IS_ENABLED(CONFIG_IPV6) #include <linux/in6.h> #endif diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 7576f49ee..ad03fbfbf 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -23,7 +23,7 @@ #include <linux/vmalloc.h> #include <linux/security.h> #include <linux/uio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" static int key_get_type_from_user(char *type, diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 1c963ff89..0f740a84d 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -18,7 +18,7 @@ #include <linux/mutex.h> #include <linux/security.h> #include <linux/user_namespace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" /* Session keyring create vs join semaphore */ diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 85730d5a5..d454e3e74 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -16,7 +16,7 @@ #include <linux/err.h> #include <linux/seq_file.h> #include <linux/slab.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" static int request_key_auth_instantiate(struct key *, diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c index 637f43d45..fe5a05326 100644 --- a/security/keys/user_defined.c +++ b/security/keys/user_defined.c @@ -15,7 +15,7 @@ #include <linux/seq_file.h> #include <linux/err.h> #include <keys/user-type.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" static int logon_vet_description(const char *desc); diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index bdf826f4f..a0a7e38a6 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -28,7 +28,7 @@ #include <linux/slab.h> #include <linux/mm.h> #include <linux/seq_file.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/dma-mapping.h> #include <linux/moduleparam.h> #include <linux/mutex.h> diff --git a/sound/core/memory.c b/sound/core/memory.c index 36c0f1a2e..fa7f735d4 100644 --- a/sound/core/memory.c +++ b/sound/core/memory.c @@ -22,7 +22,7 @@ #include <linux/export.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <sound/core.h> /** diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index 45fcdff61..602b42bc7 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c @@ -30,7 +30,7 @@ #include <sound/emu8000.h> #include <sound/emu8000_reg.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/init.h> #include <sound/control.h> #include <sound/initval.h> diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c index c99c6078b..71d13c0bb 100644 --- a/sound/isa/sb/emu8000_patch.c +++ b/sound/isa/sb/emu8000_patch.c @@ -20,7 +20,7 @@ */ #include "emu8000_local.h" -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/moduleparam.h> static int emu8000_reset_addr; diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c index 13c214466..8725c2de4 100644 --- a/sound/oss/dmasound/dmasound_atari.c +++ b/sound/oss/dmasound/dmasound_atari.c @@ -22,7 +22,7 @@ #include <linux/spinlock.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atariints.h> #include <asm/atari_stram.h> diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index bac43b5b6..d954f1e43 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c @@ -183,7 +183,7 @@ #include <linux/poll.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "dmasound.h" diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index 87910e992..d9f47da52 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c @@ -23,7 +23,7 @@ #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/setup.h> #include <asm/amigahw.h> #include <asm/amigaints.h> diff --git a/sound/oss/dmasound/dmasound_q40.c b/sound/oss/dmasound/dmasound_q40.c index 99bcb21c2..be4fe15cf 100644 --- a/sound/oss/dmasound/dmasound_q40.c +++ b/sound/oss/dmasound/dmasound_q40.c @@ -20,7 +20,7 @@ #include <linux/soundcard.h> #include <linux/interrupt.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/q40ints.h> #include <asm/q40_master.h> diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c index c0cc951ba..b63010ad2 100644 --- a/sound/oss/msnd.c +++ b/sound/oss/msnd.c @@ -32,7 +32,7 @@ #include <linux/interrupt.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/spinlock.h> #include <asm/irq.h> #include "msnd.h" diff --git a/sound/oss/os.h b/sound/oss/os.h index 75ad0cd0c..0bf89e1d6 100644 --- a/sound/oss/os.h +++ b/sound/oss/os.h @@ -17,7 +17,7 @@ #include <linux/ioport.h> #include <asm/page.h> #include <linux/vmalloc.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/poll.h> #include <linux/pci.h> #endif diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 7d8803a00..380852764 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c @@ -80,7 +80,7 @@ #include <asm/byteorder.h> #include <asm/dma.h> #include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/sibyte/sb1250_regs.h> #include <asm/sibyte/sb1250_int.h> diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c index ef5019fe5..17b9ad6e8 100644 --- a/sound/pci/asihpi/hpioctl.c +++ b/sound/pci/asihpi/hpioctl.c @@ -31,7 +31,7 @@ Common Linux HPI ioctl and module probe/remove functions #include <linux/fs.h> #include <linux/slab.h> #include <linux/moduleparam.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/pci.h> #include <linux/stringify.h> #include <linux/module.h> diff --git a/sound/soc/mediatek/common/mt_auddrv_devtree_parser.h b/sound/soc/mediatek/common/mt_auddrv_devtree_parser.h index fee238776..529e45167 100644 --- a/sound/soc/mediatek/common/mt_auddrv_devtree_parser.h +++ b/sound/soc/mediatek/common/mt_auddrv_devtree_parser.h @@ -66,7 +66,7 @@ #include <linux/proc_fs.h> #include <linux/string.h> #include <linux/mutex.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <linux/module.h> diff --git a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_afe_connection.c b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_afe_connection.c index 7efc151bb..4ed87d1f8 100644 --- a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_afe_connection.c +++ b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_afe_connection.c @@ -81,7 +81,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_afe_control.c b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_afe_control.c index 287454805..d40f7d758 100644 --- a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_afe_control.c +++ b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_afe_control.c @@ -85,7 +85,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_machine.c b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_machine.c index fe26a0da2..aa7a949ba 100644 --- a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_machine.c +++ b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_machine.c @@ -90,7 +90,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_common.h b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_common.h index 80383fdda..8065af72c 100644 --- a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_common.h +++ b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_common.h @@ -66,7 +66,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_dl1.c b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_dl1.c index b4bb9b84a..a8b542b05 100644 --- a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_dl1.c +++ b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_dl1.c @@ -84,7 +84,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_hdmi.c b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_hdmi.c index bad0e291b..266f97c61 100644 --- a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_hdmi.c +++ b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_pcm_hdmi.c @@ -86,7 +86,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_tdm_capture.c b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_tdm_capture.c index 03ad428ae..5d9c98f72 100644 --- a/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_tdm_capture.c +++ b/sound/soc/mediatek/mt_soc_audio_6580/mt_soc_tdm_capture.c @@ -82,7 +82,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_afe_connection.c b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_afe_connection.c index c00e95141..38e8afe80 100644 --- a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_afe_connection.c +++ b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_afe_connection.c @@ -73,7 +73,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_afe_control.c b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_afe_control.c index a668b28ce..cda0708a0 100644 --- a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_afe_control.c +++ b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_afe_control.c @@ -73,7 +73,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_machine.c b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_machine.c index a94bbee89..f59c094e6 100644 --- a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_machine.c +++ b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_machine.c @@ -90,7 +90,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_common.h b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_common.h index 9550cf3b3..e67267bc2 100644 --- a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_common.h +++ b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_common.h @@ -55,7 +55,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_dl1.c b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_dl1.c index 02627b7f0..d47a1b45c 100644 --- a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_dl1.c +++ b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_dl1.c @@ -84,7 +84,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_hdmi.c b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_hdmi.c index 833d495aa..bce751544 100644 --- a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_hdmi.c +++ b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_pcm_hdmi.c @@ -86,7 +86,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_tdm_capture.c b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_tdm_capture.c index 3d60aaf3c..134186661 100644 --- a/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_tdm_capture.c +++ b/sound/soc/mediatek/mt_soc_audio_8163/mt_soc_tdm_capture.c @@ -82,7 +82,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_afe_connection.c b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_afe_connection.c index 366be8955..cea2db560 100644 --- a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_afe_connection.c +++ b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_afe_connection.c @@ -81,7 +81,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_afe_control.c b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_afe_control.c index 0e2f46b94..c41c35b02 100644 --- a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_afe_control.c +++ b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_afe_control.c @@ -84,7 +84,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_machine.c b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_machine.c index 1475ed870..2a8da3ee9 100644 --- a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_machine.c +++ b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_machine.c @@ -89,7 +89,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_common.h b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_common.h index 4864e5cd9..cfd7a3521 100644 --- a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_common.h +++ b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_common.h @@ -66,7 +66,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_dl1.c b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_dl1.c index f0800102a..b43df77fe 100644 --- a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_dl1.c +++ b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_dl1.c @@ -84,7 +84,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_hdmi.c b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_hdmi.c index 5b671fc21..4b228cb0e 100644 --- a/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_hdmi.c +++ b/sound/soc/mediatek/mt_soc_audio_v1/mt_soc_pcm_hdmi.c @@ -86,7 +86,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_afe_connection.c b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_afe_connection.c index c6a6c7aad..dbf4404a4 100644 --- a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_afe_connection.c +++ b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_afe_connection.c @@ -81,7 +81,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_afe_control.c b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_afe_control.c index a456ecf97..b164cd137 100644 --- a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_afe_control.c +++ b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_afe_control.c @@ -85,7 +85,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_machine.c b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_machine.c index 967e9cdc0..c83c49c06 100644 --- a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_machine.c +++ b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_machine.c @@ -90,7 +90,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_common.h b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_common.h index 436b28479..3552ab583 100644 --- a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_common.h +++ b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_common.h @@ -66,7 +66,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_dl1.c b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_dl1.c index 1d30ec548..47d439abf 100644 --- a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_dl1.c +++ b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_dl1.c @@ -84,7 +84,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_hdmi.c b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_hdmi.c index d960c10e5..34459601d 100644 --- a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_hdmi.c +++ b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_pcm_hdmi.c @@ -86,7 +86,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_tdm_capture.c b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_tdm_capture.c index de8e731c5..d59ed9971 100644 --- a/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_tdm_capture.c +++ b/sound/soc/mediatek/mt_soc_audio_v2/mt_soc_tdm_capture.c @@ -82,7 +82,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_afe_connection.c b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_afe_connection.c index 7420b52e1..932f2e63c 100644 --- a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_afe_connection.c +++ b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_afe_connection.c @@ -81,7 +81,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_afe_control.c b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_afe_control.c index 914a5ee8f..74247b615 100644 --- a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_afe_control.c +++ b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_afe_control.c @@ -86,7 +86,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_machine.c b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_machine.c index aeefa1abb..f02283005 100644 --- a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_machine.c +++ b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_machine.c @@ -90,7 +90,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_common.h b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_common.h index def96e6ce..e27ca0dad 100644 --- a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_common.h +++ b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_common.h @@ -66,7 +66,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_dl1.c b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_dl1.c index 86cdd17d0..31d812da4 100644 --- a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_dl1.c +++ b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_dl1.c @@ -84,7 +84,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_hdmi.c b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_hdmi.c index a8d90ce99..521eec4a1 100644 --- a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_hdmi.c +++ b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_pcm_hdmi.c @@ -86,7 +86,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_tdm_capture.c b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_tdm_capture.c index 3d60aaf3c..134186661 100644 --- a/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_tdm_capture.c +++ b/sound/soc/mediatek/mt_soc_audio_v3/mt_soc_tdm_capture.c @@ -82,7 +82,7 @@ #include <linux/mutex.h> #include <linux/xlog.h> #include <mach/irqs.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/irq.h> #include <asm/io.h> #include <mach/mt_reg_base.h> diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c index b155137ee..08dfca761 100644 --- a/sound/sound_firmware.c +++ b/sound/sound_firmware.c @@ -4,7 +4,7 @@ #include <linux/file.h> #include <linux/mm.h> #include <linux/sched.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "oss/sound_firmware.h" static int do_mod_firmware_load(const char *fn, char **fp) diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c index 5ae1eae9f..e55794671 100644 --- a/sound/synth/emux/emux_hwdep.c +++ b/sound/synth/emux/emux_hwdep.c @@ -21,7 +21,7 @@ #include <sound/core.h> #include <sound/hwdep.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "emux_voice.h" diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c index 646b66703..ac75816ad 100644 --- a/sound/synth/emux/emux_oss.c +++ b/sound/synth/emux/emux_oss.c @@ -26,7 +26,7 @@ #ifdef CONFIG_SND_SEQUENCER_OSS #include <linux/export.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <sound/core.h> #include "emux_voice.h" #include <sound/asoundef.h> diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c index 1137b85c3..c5ac03932 100644 --- a/sound/synth/emux/soundfont.c +++ b/sound/synth/emux/soundfont.c @@ -25,7 +25,7 @@ * of doing things so that the old sfxload utility can be used. * Everything may change when there is an alsa way of doing things. */ -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/export.h> #include <sound/core.h> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0715673b6..b8e4d8dea 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -53,7 +53,7 @@ #include <asm/processor.h> #include <asm/io.h> #include <asm/ioctl.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include "coalesced_mmio.h" |