Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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>
This commit is contained in:
Brian Behlendorf 2014-10-01 16:40:37 -04:00
parent e5b65e3179
commit d227e114ed
4 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/spl-build.m4
View File

@ -27,7 +27,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
SPL_AC_CTL_NAME SPL_AC_CTL_NAME
SPL_AC_VMALLOC_INFO SPL_AC_VMALLOC_INFO
SPL_AC_PDE_DATA SPL_AC_PDE_DATA
SPL_AC_UACCESS_HEADER
SPL_AC_KMALLOC_NODE SPL_AC_KMALLOC_NODE
SPL_AC_INODE_I_MUTEX SPL_AC_INODE_I_MUTEX
SPL_AC_MUTEX_OWNER SPL_AC_MUTEX_OWNER
@ -928,14 +927,6 @@ AC_DEFUN([SPL_AC_CTL_NAME], [
]) ])
]) ])
dnl #
dnl # 2.6.18 API change,
dnl # added linux/uaccess.h
dnl #
AC_DEFUN([SPL_AC_UACCESS_HEADER], [
SPL_CHECK_HEADER([linux/uaccess.h], [UACCESS], [], [])
])
dnl # dnl #
dnl # 2.6.12 API change, dnl # 2.6.12 API change,
dnl # check whether 'kmalloc_node()' is available. dnl # check whether 'kmalloc_node()' is available.

1
include/linux/Makefile.am
View File

@ -15,7 +15,6 @@ KERNEL_H = \
$(top_srcdir)/include/linux/rwsem_compat.h \ $(top_srcdir)/include/linux/rwsem_compat.h \
$(top_srcdir)/include/linux/smp_compat.h \ $(top_srcdir)/include/linux/smp_compat.h \
$(top_srcdir)/include/linux/sysctl_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/wait_compat.h \
$(top_srcdir)/include/linux/zlib_compat.h $(top_srcdir)/include/linux/zlib_compat.h

35
include/linux/uaccess_compat.h
View File

@ -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 */

2
include/sys/types.h
View File

@ -28,7 +28,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <linux/uaccess_compat.h>
#include <linux/file_compat.h> #include <linux/file_compat.h>
#include <linux/list_compat.h> #include <linux/list_compat.h>
#include <linux/bitops_compat.h> #include <linux/bitops_compat.h>
@ -43,6 +42,7 @@
#include <linux/mm_compat.h> #include <linux/mm_compat.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/wait_compat.h> #include <linux/wait_compat.h>
#include <linux/uaccess.h>
#ifndef ULLONG_MAX #ifndef ULLONG_MAX
#define ULLONG_MAX (~0ULL) #define ULLONG_MAX (~0ULL)