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

This commit is contained in:
Brian Behlendorf 2010-05-18 12:53:05 -07:00
commit 8149cee19b
2 changed files with 33 additions and 1 deletions

View File

@ -26,7 +26,7 @@
#include <sys/kmem.h> #include <rpc/types.h>
#include <sys/nvpair.h> #include <sys/nvpair.h>
static void * static void *

View File

@ -0,0 +1,32 @@
/*
* 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 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#ifndef LIBSPL_RPC_TYPES_H
#define LIBSPL_RPC_TYPES_H
#include_next <rpc/types.h>
#include <sys/kmem.h>
#endif /* LIBSPL_RPC_TYPES_H */