From 8588b01909e0145e5e84f5fe0a5353bd194f205c Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Dec 2016 11:46:01 -0800
Subject: 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>
---
 drivers/acpi/battery.c              | 2 +-
 drivers/acpi/fan.c                  | 2 +-
 drivers/acpi/osl.c                  | 2 +-
 drivers/acpi/proc.c                 | 2 +-
 drivers/acpi/processor_driver.c     | 2 +-
 drivers/acpi/processor_thermal.c    | 2 +-
 drivers/acpi/processor_throttling.c | 2 +-
 drivers/acpi/sbs.c                  | 2 +-
 drivers/acpi/thermal.c              | 2 +-
 drivers/acpi/video.c                | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'drivers/acpi')

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>
-- 
cgit v1.2.3