From owner-svn-src-vendor@FreeBSD.ORG Sun Apr 19 23:45:05 2015 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36C9E271; Sun, 19 Apr 2015 23:45:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 24D07F07; Sun, 19 Apr 2015 23:45:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3JNj5D6072879; Sun, 19 Apr 2015 23:45:05 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3JNj4hN072878; Sun, 19 Apr 2015 23:45:04 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504192345.t3JNj4hN072878@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sun, 19 Apr 2015 23:45:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r281755 - vendor-sys/illumos/dist/uts/common X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Apr 2015 23:45:05 -0000 Author: delphij Date: Sun Apr 19 23:45:04 2015 New Revision: 281755 URL: https://svnweb.freebsd.org/changeset/base/281755 Log: Sync Makefile.files to illumos-gate@244781f10dcd82684fd8163c016540667842f203. Modified: vendor-sys/illumos/dist/uts/common/Makefile.files Modified: vendor-sys/illumos/dist/uts/common/Makefile.files ============================================================================== --- vendor-sys/illumos/dist/uts/common/Makefile.files Sun Apr 19 23:31:00 2015 (r281754) +++ vendor-sys/illumos/dist/uts/common/Makefile.files Sun Apr 19 23:45:04 2015 (r281755) @@ -21,9 +21,9 @@ # # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2013 by Delphix. All rights reserved. # Copyright (c) 2013 by Saso Kiselkov. All rights reserved. +# Copyright 2014 Nexenta Systems, Inc. All rights reserved. # # @@ -1328,6 +1328,7 @@ TRANS_OBJS += mdtrans.o trans_ioctl.o tr ZFS_COMMON_OBJS += \ arc.o \ + blkptr.o \ bplist.o \ bpobj.o \ bptree.o \ @@ -1360,6 +1361,7 @@ ZFS_COMMON_OBJS += \ lz4.o \ lzjb.o \ metaslab.o \ + multilist.o \ range_tree.o \ refcount.o \ rrwlock.o \ @@ -1846,7 +1848,8 @@ ZYD_OBJS += zyd.o zyd_usb.o zyd_hw.o zyd MXFE_OBJS += mxfe.o -MPTSAS_OBJS += mptsas.o mptsas_impl.o mptsas_init.o mptsas_raid.o mptsas_smhba.o +MPTSAS_OBJS += mptsas.o mptsas_hash.o mptsas_impl.o mptsas_init.o \ + mptsas_raid.o mptsas_smhba.o SFE_OBJS += sfe.o sfe_util.o @@ -1865,6 +1868,8 @@ ATGE_OBJS += atge_main.o atge_l1e.o atge YGE_OBJS = yge.o +SKD_OBJS = skd.o + # # Build up defines and paths. #