Commit 03d749c2 authored by Mo Zhou's avatar Mo Zhou

New upstream version 0.7.12

parent a07c8b41
Meta: 1
Name: zfs
Branch: 1.0
Version: 0.7.11
Version: 0.7.12
Release: 1
Release-Tags: relext
License: CDDL
......
......@@ -119,6 +119,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -1130,6 +1130,7 @@ m4_include([config/kernel-get-disk-ro.m4])
m4_include([config/kernel-get-gendisk.m4])
m4_include([config/kernel-get-link.m4])
m4_include([config/kernel-global_page_state.m4])
m4_include([config/kernel-in-compat-syscall.m4])
m4_include([config/kernel-inode-getattr.m4])
m4_include([config/kernel-inode-set-flags.m4])
m4_include([config/kernel-inode-set-iversion.m4])
......
......@@ -94,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -112,7 +112,6 @@ cur = {}
d = {}
out = None
kstat = None
float_pobj = re.compile("^[0-9]+(\.[0-9]+)?$")
def detailed_usage():
......
......@@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -24,7 +24,7 @@
* Copyright (c) 2011, 2016 by Delphix. All rights reserved.
* Copyright (c) 2014 Integros [integros.com]
* Copyright 2016 Nexenta Systems, Inc.
* Copyright (c) 2017 Lawrence Livermore National Security, LLC.
* Copyright (c) 2017, 2018 Lawrence Livermore National Security, LLC.
* Copyright (c) 2015, 2017, Intel Corporation.
*/
......@@ -3659,6 +3659,22 @@ dump_simulated_ddt(spa_t *spa)
dump_dedup_ratio(&dds_total);
}
static void
zdb_set_skip_mmp(char *target)
{
spa_t *spa;
/*
* Disable the activity check to allow examination of
* active pools.
*/
mutex_enter(&spa_namespace_lock);
if ((spa = spa_lookup(target)) != NULL) {
spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP;
}
mutex_exit(&spa_namespace_lock);
}
static void
dump_zpool(spa_t *spa)
{
......@@ -4412,14 +4428,15 @@ main(int argc, char **argv)
target, strerror(ENOMEM));
}
/*
* Disable the activity check to allow examination of
* active pools.
*/
if (dump_opt['C'] > 1) {
(void) printf("\nConfiguration for import:\n");
dump_nvlist(cfg, 8);
}
/*
* Disable the activity check to allow examination of
* active pools.
*/
error = spa_import(target_pool, cfg, NULL,
flags | ZFS_IMPORT_SKIP_MMP);
}
......@@ -4430,16 +4447,7 @@ main(int argc, char **argv)
if (error == 0) {
if (target_is_spa || dump_opt['R']) {
/*
* Disable the activity check to allow examination of
* active pools.
*/
mutex_enter(&spa_namespace_lock);
if ((spa = spa_lookup(target)) != NULL) {
spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP;
}
mutex_exit(&spa_namespace_lock);
zdb_set_skip_mmp(target);
error = spa_open_rewind(target, &spa, FTAG, policy,
NULL);
if (error) {
......@@ -4462,6 +4470,7 @@ main(int argc, char **argv)
}
}
} else {
zdb_set_skip_mmp(target);
error = open_objset(target, DMU_OST_ANY, FTAG, &os);
}
}
......
......@@ -100,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -3493,7 +3493,7 @@ single_histo_average(uint64_t *histo, unsigned int buckets)
static void
print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
nvlist_t *newnv, double scale)
nvlist_t *newnv)
{
int i;
uint64_t val;
......@@ -3523,7 +3523,7 @@ print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
format = ZFS_NICENUM_1024;
for (i = 0; i < ARRAY_SIZE(names); i++) {
val = nva[i].data[0] * scale;
val = nva[i].data[0];
print_one_stat(val, format, column_width, cb->cb_scripted);
}
......@@ -3532,7 +3532,7 @@ print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
static void
print_iostat_latency(iostat_cbdata_t *cb, nvlist_t *oldnv,
nvlist_t *newnv, double scale)
nvlist_t *newnv)
{
int i;
uint64_t val;
......@@ -3562,7 +3562,7 @@ print_iostat_latency(iostat_cbdata_t *cb, nvlist_t *oldnv,
/* Print our avg latencies on the line */
for (i = 0; i < ARRAY_SIZE(names); i++) {
/* Compute average latency for a latency histo */
val = single_histo_average(nva[i].data, nva[i].count) * scale;
val = single_histo_average(nva[i].data, nva[i].count);
print_one_stat(val, format, column_width, cb->cb_scripted);
}
free_calc_stats(nva, ARRAY_SIZE(names));
......@@ -3701,9 +3701,9 @@ print_vdev_stats(zpool_handle_t *zhp, const char *name, nvlist_t *oldnv,
print_iostat_default(calcvs, cb, scale);
}
if (cb->cb_flags & IOS_LATENCY_M)
print_iostat_latency(cb, oldnv, newnv, scale);
print_iostat_latency(cb, oldnv, newnv);
if (cb->cb_flags & IOS_QUEUES_M)
print_iostat_queues(cb, oldnv, newnv, scale);
print_iostat_queues(cb, oldnv, newnv);
if (cb->cb_flags & IOS_ANYHISTO_M) {
printf("\n");
print_iostat_histos(cb, oldnv, newnv, scale, name);
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
......@@ -1189,7 +1189,7 @@ ztest_spa_prop_set_uint64(zpool_prop_t prop, uint64_t value)
*/
typedef struct {
list_node_t z_lnode;
refcount_t z_refcnt;
zfs_refcount_t z_refcnt;
uint64_t z_object;
zfs_rlock_t z_range_lock;
} ztest_znode_t;
......@@ -1205,7 +1205,7 @@ ztest_znode_init(uint64_t object)
ztest_znode_t *zp = umem_alloc(sizeof (*zp), UMEM_NOFAIL);
list_link_init(&zp->z_lnode);
refcount_create(&zp->z_refcnt);
zfs_refcount_create(&zp->z_refcnt);
zp->z_object = object;
zfs_rlock_init(&zp->z_range_lock);
......@@ -1215,10 +1215,10 @@ ztest_znode_init(uint64_t object)
static void
ztest_znode_fini(ztest_znode_t *zp)
{
ASSERT(refcount_is_zero(&zp->z_refcnt));
ASSERT(zfs_refcount_is_zero(&zp->z_refcnt));
zfs_rlock_destroy(&zp->z_range_lock);
zp->z_object = 0;
refcount_destroy(&zp->z_refcnt);
zfs_refcount_destroy(&zp->z_refcnt);
list_link_init(&zp->z_lnode);
umem_free(zp, sizeof (*zp));
}
......@@ -1248,13 +1248,13 @@ ztest_znode_get(ztest_ds_t *zd, uint64_t object)
for (zp = list_head(&zll->z_list); (zp);
zp = list_next(&zll->z_list, zp)) {
if (zp->z_object == object) {
refcount_add(&zp->z_refcnt, RL_TAG);
zfs_refcount_add(&zp->z_refcnt, RL_TAG);
break;
}
}
if (zp == NULL) {
zp = ztest_znode_init(object);
refcount_add(&zp->z_refcnt, RL_TAG);
zfs_refcount_add(&zp->z_refcnt, RL_TAG);
list_insert_head(&zll->z_list, zp);
}
mutex_exit(&zll->z_lock);
......@@ -1268,8 +1268,8 @@ ztest_znode_put(ztest_ds_t *zd, ztest_znode_t *zp)
ASSERT3U(zp->z_object, !=, 0);
zll = &zd->zd_range_lock[zp->z_object & (ZTEST_OBJECT_LOCKS - 1)];
mutex_enter(&zll->z_lock);
refcount_remove(&zp->z_refcnt, RL_TAG);
if (refcount_is_zero(&zp->z_refcnt)) {
zfs_refcount_remove(&zp->z_refcnt, RL_TAG);
if (zfs_refcount_is_zero(&zp->z_refcnt)) {
list_remove(&zll->z_list, zp);
ztest_znode_fini(zp);
}
......
......@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \
$(top_srcdir)/config/kernel-get-gendisk.m4 \
$(top_srcdir)/config/kernel-get-link.m4 \
$(top_srcdir)/config/kernel-global_page_state.m4 \
$(top_srcdir)/config/kernel-in-compat-syscall.m4 \
$(top_srcdir)/config/kernel-inode-getattr.m4 \
$(top_srcdir)/config/kernel-inode-set-flags.m4 \
$(top_srcdir)/config/kernel-inode-set-iversion.m4 \
......
dnl #
dnl # 4.5 API change
dnl # Added in_compat_syscall() which can be overridden on a per-
dnl # architecture basis. Prior to this is_compat_task() was the
dnl # provided interface.
dnl #
AC_DEFUN([ZFS_AC_KERNEL_IN_COMPAT_SYSCALL], [
AC_MSG_CHECKING([whether in_compat_syscall() is available])
ZFS_LINUX_TRY_COMPILE([
#include <linux/compat.h>
],[
in_compat_syscall();
],[
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_IN_COMPAT_SYSCALL, 1,
[in_compat_syscall() is available])
],[
AC_MSG_RESULT(no)
])
])
......@@ -129,6 +129,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_GLOBAL_PAGE_STATE
ZFS_AC_KERNEL_ACL_HAS_REFCOUNT
ZFS_AC_KERNEL_USERNS_CAPABILITIES
ZFS_AC_KERNEL_IN_COMPAT_SYSCALL
AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for zfs 0.7.11.
# Generated by GNU Autoconf 2.63 for zfs 0.7.12.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
......@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='zfs'
PACKAGE_TARNAME='zfs'
PACKAGE_VERSION='0.7.11'
PACKAGE_STRING='zfs 0.7.11'
PACKAGE_VERSION='0.7.12'
PACKAGE_STRING='zfs 0.7.12'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
......@@ -1618,7 +1618,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures zfs 0.7.11 to adapt to many kinds of systems.
\`configure' configures zfs 0.7.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1689,7 +1689,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of zfs 0.7.11:";;
short | recursive ) echo "Configuration of zfs 0.7.12:";;
esac
cat <<\_ACEOF
......@@ -1826,7 +1826,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
zfs configure 0.7.11
zfs configure 0.7.12
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1840,7 +1840,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by zfs $as_me 0.7.11, which was
It was created by zfs $as_me 0.7.12, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
......@@ -2998,7 +2998,7 @@ fi
# Define the identity of the package.
PACKAGE='zfs'
VERSION='0.7.11'
VERSION='0.7.12'
cat >>confdefs.h <<_ACEOF
......@@ -28789,6 +28789,79 @@ fi
{ $as_echo "$as_me:$LINENO: checking whether in_compat_syscall() is available" >&5
$as_echo_n "checking whether in_compat_syscall() is available... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.c
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <linux/compat.h>
int
main (void)
{
in_compat_syscall();
;
return 0;
}
_ACEOF
cat - <<_ACEOF >conftest.h
_ACEOF
rm -Rf build && mkdir -p build && touch build/conftest.mod.c
echo "obj-m := conftest.o" >build/Makefile
modpost_flag=''
test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage
if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
cat >>confdefs.h <<\_ACEOF
#define HAVE_IN_COMPAT_SYSCALL 1
_ACEOF
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
rm -Rf build
if test "$LINUX_OBJ" != "$LINUX"; then
KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
......@@ -48216,6 +48289,79 @@ fi
{ $as_echo "$as_me:$LINENO: checking whether in_compat_syscall() is available" >&5
$as_echo_n "checking whether in_compat_syscall() is available... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.c
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <linux/compat.h>
int
main (void)
{
in_compat_syscall();
;
return 0;
}
_ACEOF
cat - <<_ACEOF >conftest.h
_ACEOF
rm -Rf build && mkdir -p build && touch build/conftest.mod.c
echo "obj-m := conftest.o" >build/Makefile
modpost_flag=''
test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage
if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
cat >>confdefs.h <<\_ACEOF
#define HAVE_IN_COMPAT_SYSCALL 1
_ACEOF
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
rm -Rf build