summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2015-10-02 20:07:03 +0000
committermav <mav@FreeBSD.org>2015-10-02 20:07:03 +0000
commit70cfec0df3dc1ec235822bbbf269c83082cdc65c (patch)
treec510676266670e01836ed276c4a24b8f55984aae /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
parent5ba5b1d9aff8584a69d39fda2fa0f572da7b99ce (diff)
downloadFreeBSD-src-70cfec0df3dc1ec235822bbbf269c83082cdc65c.zip
FreeBSD-src-70cfec0df3dc1ec235822bbbf269c83082cdc65c.tar.gz
MFC r277826 (by delphij):
Diff reduction with upstream. The actual change was merged in r272483 already.
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
index e91fb7d..9854fe4 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2011, 2014 by Delphix. All rights reserved.
* Copyright (c) 2014 by Saso Kiselkov. All rights reserved.
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
OpenPOWER on IntegriCloud