Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

zfs/lib/libnvpair/libnvpair.c

@@ -565,7 +565,7 @@ nvpair_value_match_regex(nvpair_t *nvp, int ai,
 		boolean_t val, val_arg;
 
 		/* scanf boolean_t from value and check for match */
-		sr = sscanf(value, "%"SCNi32, &val_arg);
+		sr = sscanf(value, "%"SCNi32, (int32_t *)&val_arg);
 		if ((sr == 1) &&
 		    (nvpair_value_boolean_value(nvp, &val) == 0) &&
 		    (val == val_arg))
@@ -576,7 +576,7 @@ nvpair_value_match_regex(nvpair_t *nvp, int ai,
 		boolean_t *val_array, val_arg;
 
 		/* check indexed value of array for match */
-		sr = sscanf(value, "%"SCNi32, &val_arg);
+		sr = sscanf(value, "%"SCNi32, (int32_t *)&val_arg);
 		if ((sr == 1) &&
 		    (nvpair_value_boolean_array(nvp,
 		    &val_array, &a_len) == 0) &&

zfs/lib/libnvpair/nvpair_alloc_system.c

@@ -26,7 +26,7 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include <rpc/types.h>
+#include <sys/kmem.h>
 #include <sys/nvpair.h>
 
 static void *

zfs/lib/libspl/include/sys/kmem.h

@@ -0,0 +1,47 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _SYS_KMEM_H
+#define	_SYS_KMEM_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <stdlib.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	KM_SLEEP	0x00000000	/* same as KM_SLEEP */
+#define	KM_NOSLEEP	0x00000001	/* same as KM_NOSLEEP */
+
+#define kmem_alloc(size, flags)		malloc(size)
+#define kmem_free(ptr, size)		free(ptr)
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _SYS_KMEM_H */