30 files changed, 30 insertions, 30 deletions
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)
 {