diff options
| author | Brian Behlendorf <[email protected]> | 2010-05-28 13:45:14 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-05-28 13:45:14 -0700 |
| commit | 428870ff734fdaccc342b33fc53cf94724409a46 (patch) | |
| tree | 164e83c0ceda52a843795ed7cd9e95637d02c177 /cmd/zfs/zfs_util.h | |
| parent | 6119cb885a976e175a6e827894accf657ff1984f (diff) | |
Update core ZFS code from build 121 to build 141.
Diffstat (limited to 'cmd/zfs/zfs_util.h')
| -rw-r--r-- | cmd/zfs/zfs_util.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/zfs/zfs_util.h b/cmd/zfs/zfs_util.h index c7f2f1618..3ddff9e22 100644 --- a/cmd/zfs/zfs_util.h +++ b/cmd/zfs/zfs_util.h @@ -19,15 +19,12 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _ZFS_UTIL_H #define _ZFS_UTIL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <libzfs.h> #ifdef __cplusplus @@ -35,6 +32,7 @@ extern "C" { #endif void * safe_malloc(size_t size); +void nomem(void); libzfs_handle_t *g_zfs; #ifdef __cplusplus |