Remove on_each_cpu() wrapper
The on_each_cpu() function has been available since Linux 2.6.27. There is no longer a need to maintain this compatibility code. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
parent
b652d169b0
commit
50e41ab1e1
|
@ -29,7 +29,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
|
||||||
SPL_AC_PDE_DATA
|
SPL_AC_PDE_DATA
|
||||||
SPL_AC_MUTEX_OWNER
|
SPL_AC_MUTEX_OWNER
|
||||||
SPL_AC_MUTEX_OWNER_TASK_STRUCT
|
SPL_AC_MUTEX_OWNER_TASK_STRUCT
|
||||||
SPL_AC_3ARGS_ON_EACH_CPU
|
|
||||||
SPL_AC_KALLSYMS_LOOKUP_NAME
|
SPL_AC_KALLSYMS_LOOKUP_NAME
|
||||||
SPL_AC_GET_VMALLOC_INFO
|
SPL_AC_GET_VMALLOC_INFO
|
||||||
SPL_AC_PGDAT_HELPERS
|
SPL_AC_PGDAT_HELPERS
|
||||||
|
@ -972,28 +971,6 @@ AC_DEFUN([SPL_AC_MUTEX_OWNER_TASK_STRUCT], [
|
||||||
EXTRA_KCFLAGS="$tmp_flags"
|
EXTRA_KCFLAGS="$tmp_flags"
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl #
|
|
||||||
dnl # 2.6.27 API change,
|
|
||||||
dnl # on_each_cpu() uses 3 args, no 'retry' argument
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([SPL_AC_3ARGS_ON_EACH_CPU], [
|
|
||||||
AC_MSG_CHECKING([whether on_each_cpu() wants 3 args])
|
|
||||||
SPL_LINUX_TRY_COMPILE([
|
|
||||||
#include <linux/interrupt.h>
|
|
||||||
#include <linux/smp.h>
|
|
||||||
|
|
||||||
void on_each_cpu_func(void *data) { return; }
|
|
||||||
],[
|
|
||||||
on_each_cpu(on_each_cpu_func, NULL, 0);
|
|
||||||
],[
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
AC_DEFINE(HAVE_3ARGS_ON_EACH_CPU, 1,
|
|
||||||
[on_each_cpu wants 3 args])
|
|
||||||
],[
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl #
|
dnl #
|
||||||
dnl # 2.6.18 API change,
|
dnl # 2.6.18 API change,
|
||||||
dnl # kallsyms_lookup_name no longer exported
|
dnl # kallsyms_lookup_name no longer exported
|
||||||
|
|
|
@ -12,7 +12,6 @@ KERNEL_H = \
|
||||||
$(top_srcdir)/include/linux/module_compat.h \
|
$(top_srcdir)/include/linux/module_compat.h \
|
||||||
$(top_srcdir)/include/linux/proc_compat.h \
|
$(top_srcdir)/include/linux/proc_compat.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/sysctl_compat.h \
|
$(top_srcdir)/include/linux/sysctl_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
|
||||||
|
|
|
@ -1,40 +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_SMP_COMPAT_H
|
|
||||||
#define _SPL_SMP_COMPAT_H
|
|
||||||
|
|
||||||
#include <linux/smp.h>
|
|
||||||
|
|
||||||
#ifdef HAVE_3ARGS_ON_EACH_CPU
|
|
||||||
|
|
||||||
#define spl_on_each_cpu(func,info,wait) on_each_cpu(func,info,wait)
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#define spl_on_each_cpu(func,info,wait) on_each_cpu(func,info,0,wait)
|
|
||||||
|
|
||||||
#endif /* HAVE_3ARGS_ON_EACH_CPU */
|
|
||||||
|
|
||||||
#endif /* _SPL_SMP_COMPAT_H */
|
|
|
@ -31,7 +31,6 @@
|
||||||
#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>
|
||||||
#include <linux/smp_compat.h>
|
|
||||||
#include <linux/kallsyms_compat.h>
|
#include <linux/kallsyms_compat.h>
|
||||||
#include <linux/module_compat.h>
|
#include <linux/module_compat.h>
|
||||||
#include <linux/sysctl_compat.h>
|
#include <linux/sysctl_compat.h>
|
||||||
|
|
|
@ -1391,7 +1391,7 @@ spl_cache_age(void *data)
|
||||||
atomic_inc(&skc->skc_ref);
|
atomic_inc(&skc->skc_ref);
|
||||||
|
|
||||||
if (!(skc->skc_flags & KMC_NOMAGAZINE))
|
if (!(skc->skc_flags & KMC_NOMAGAZINE))
|
||||||
spl_on_each_cpu(spl_magazine_age, skc, 1);
|
on_each_cpu(spl_magazine_age, skc, 1);
|
||||||
|
|
||||||
spl_slab_reclaim(skc, skc->skc_reap, 0);
|
spl_slab_reclaim(skc, skc->skc_reap, 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue