summaryrefslogtreecommitdiffstats
path: root/kernel/futex_compat.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-01-30 08:57:22 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-01-30 08:57:22 +0100
commit1b62d134d3c5f9e67de096af7ea3e9fe48966f17 (patch)
treebe30467e997cc8ba0d350309dd498f00cb69969b /kernel/futex_compat.c
parentACPICA: Tables: Fix hidden logic related to acpi_tb_install_standard_table() (diff)
parentACPICA: Update version to 20161222 (diff)
downloadlinux-1b62d134d3c5f9e67de096af7ea3e9fe48966f17.tar.xz
linux-1b62d134d3c5f9e67de096af7ea3e9fe48966f17.zip
Merge back earlier ACPICA changes for v4.11.
Diffstat (limited to 'kernel/futex_compat.c')
-rw-r--r--kernel/futex_compat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index 4ae3232e7a28..3f409968e466 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>
/*