aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBrian Behlendorf <behlendorf1@llnl.gov>2014-10-01 16:40:37 -0400
committerBrian Behlendorf <behlendorf1@llnl.gov>2014-10-17 15:11:51 -0700
commitd227e114edd65356c928b660c19d6f1f471c9f8d (patch)
tree57072c17bab3cdd79522f378cd91f8e559b01bcf /include
parente5b65e317948926f082740a331900eb9aaddc624 (diff)
Remove linux/uaccess.h header check
The uaccess header has been available in the same location since Linux 2.6.18. There is no longer a need to maintain this compatibility code. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Diffstat (limited to 'include')
-rw-r--r--include/linux/Makefile.am1
-rw-r--r--include/linux/uaccess_compat.h35
-rw-r--r--include/sys/types.h2
3 files changed, 1 insertions, 37 deletions
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index c921cc576..94ffc4721 100644
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -15,7 +15,6 @@ KERNEL_H = \
$(top_srcdir)/include/linux/rwsem_compat.h \
$(top_srcdir)/include/linux/smp_compat.h \
$(top_srcdir)/include/linux/sysctl_compat.h \
- $(top_srcdir)/include/linux/uaccess_compat.h \
$(top_srcdir)/include/linux/wait_compat.h \
$(top_srcdir)/include/linux/zlib_compat.h
diff --git a/include/linux/uaccess_compat.h b/include/linux/uaccess_compat.h
deleted file mode 100644
index c84e61d30..000000000
--- a/include/linux/uaccess_compat.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************\
- * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
- * Copyright (C) 2007 The Regents of the University of California.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Brian Behlendorf <behlendorf1@llnl.gov>.
- * UCRL-CODE-235197
- *
- * This file is part of the SPL, Solaris Porting Layer.
- * For details, see <http://zfsonlinux.org/>.
- *
- * The SPL is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * The SPL is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the SPL. If not, see <http://www.gnu.org/licenses/>.
-\*****************************************************************************/
-
-#ifndef _SPL_UACCESS_COMPAT_H
-#define _SPL_UACCESS_COMPAT_H
-
-#ifdef HAVE_UACCESS_HEADER
-#include <linux/uaccess.h>
-#else
-#include <asm/uaccess.h>
-#endif
-
-#endif /* _SPL_UACCESS_COMPAT_H */
-
diff --git a/include/sys/types.h b/include/sys/types.h
index a2b68efe3..3bd0cfd92 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -28,7 +28,6 @@
#include <linux/types.h>
#include <sys/sysmacros.h>
-#include <linux/uaccess_compat.h>
#include <linux/file_compat.h>
#include <linux/list_compat.h>
#include <linux/bitops_compat.h>
@@ -43,6 +42,7 @@
#include <linux/mm_compat.h>
#include <linux/delay.h>
#include <linux/wait_compat.h>
+#include <linux/uaccess.h>
#ifndef ULLONG_MAX
#define ULLONG_MAX (~0ULL)