Remove utsname() wrapper
There is no longer a need to wrap this because utsname() is provided by the kernel and can be called directly. This will require a small change in the ZFS code because utsname is expected to be a global structure and not a function. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf
parent
aa363c5c05
commit
bb4dee3df2
|
|
@ -36,7 +36,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
|
||||||
SPL_AC_SET_NORMALIZED_TIMESPEC_EXPORT
|
SPL_AC_SET_NORMALIZED_TIMESPEC_EXPORT
|
||||||
SPL_AC_SET_NORMALIZED_TIMESPEC_INLINE
|
SPL_AC_SET_NORMALIZED_TIMESPEC_INLINE
|
||||||
SPL_AC_TIMESPEC_SUB
|
SPL_AC_TIMESPEC_SUB
|
||||||
SPL_AC_INIT_UTSNAME
|
|
||||||
SPL_AC_UACCESS_HEADER
|
SPL_AC_UACCESS_HEADER
|
||||||
SPL_AC_KMALLOC_NODE
|
SPL_AC_KMALLOC_NODE
|
||||||
SPL_AC_MONOTONIC_CLOCK
|
SPL_AC_MONOTONIC_CLOCK
|
||||||
|
|
@ -1114,25 +1113,6 @@ AC_DEFUN([SPL_AC_TIMESPEC_SUB], [
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl #
|
|
||||||
dnl # 2.6.19 API change,
|
|
||||||
dnl # check if init_utsname() is available in linux/utsname.h
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([SPL_AC_INIT_UTSNAME], [
|
|
||||||
AC_MSG_CHECKING([whether init_utsname() is available])
|
|
||||||
SPL_LINUX_TRY_COMPILE([
|
|
||||||
#include <linux/utsname.h>
|
|
||||||
],[
|
|
||||||
struct new_utsname *a __attribute__ ((unused));
|
|
||||||
a = init_utsname();
|
|
||||||
],[
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
AC_DEFINE(HAVE_INIT_UTSNAME, 1, [init_utsname() is available])
|
|
||||||
],[
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl #
|
dnl #
|
||||||
dnl # 2.6.18 API change,
|
dnl # 2.6.18 API change,
|
||||||
dnl # added linux/uaccess.h
|
dnl # added linux/uaccess.h
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,6 @@ KERNEL_H = \
|
||||||
$(top_srcdir)/include/sys/u8_textprep.h \
|
$(top_srcdir)/include/sys/u8_textprep.h \
|
||||||
$(top_srcdir)/include/sys/uio.h \
|
$(top_srcdir)/include/sys/uio.h \
|
||||||
$(top_srcdir)/include/sys/unistd.h \
|
$(top_srcdir)/include/sys/unistd.h \
|
||||||
$(top_srcdir)/include/sys/utsname.h \
|
|
||||||
$(top_srcdir)/include/sys/va_list.h \
|
$(top_srcdir)/include/sys/va_list.h \
|
||||||
$(top_srcdir)/include/sys/varargs.h \
|
$(top_srcdir)/include/sys/varargs.h \
|
||||||
$(top_srcdir)/include/sys/vfs.h \
|
$(top_srcdir)/include/sys/vfs.h \
|
||||||
|
|
|
||||||
|
|
@ -1,34 +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_UTSNAME_H
|
|
||||||
#define _SPL_UTSNAME_H
|
|
||||||
|
|
||||||
#include <linux/utsname.h>
|
|
||||||
|
|
||||||
extern struct new_utsname *__utsname(void);
|
|
||||||
|
|
||||||
#define utsname (*__utsname())
|
|
||||||
|
|
||||||
#endif /* SPL_UTSNAME_H */
|
|
||||||
|
|
@ -37,7 +37,6 @@
|
||||||
#include <sys/debug.h>
|
#include <sys/debug.h>
|
||||||
#include <sys/proc.h>
|
#include <sys/proc.h>
|
||||||
#include <sys/kstat.h>
|
#include <sys/kstat.h>
|
||||||
#include <sys/utsname.h>
|
|
||||||
#include <sys/file.h>
|
#include <sys/file.h>
|
||||||
#include <linux/kmod.h>
|
#include <linux/kmod.h>
|
||||||
#include <linux/proc_compat.h>
|
#include <linux/proc_compat.h>
|
||||||
|
|
@ -438,17 +437,6 @@ __put_task_struct(struct task_struct *t)
|
||||||
EXPORT_SYMBOL(__put_task_struct);
|
EXPORT_SYMBOL(__put_task_struct);
|
||||||
#endif /* HAVE_PUT_TASK_STRUCT */
|
#endif /* HAVE_PUT_TASK_STRUCT */
|
||||||
|
|
||||||
struct new_utsname *__utsname(void)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_INIT_UTSNAME
|
|
||||||
return init_utsname();
|
|
||||||
#else
|
|
||||||
return &system_utsname;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(__utsname);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Read the unique system identifier from the /etc/hostid file.
|
* Read the unique system identifier from the /etc/hostid file.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue