From owner-svn-src-vendor@FreeBSD.ORG Wed Nov 20 10:12:48 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 446FDA6A; Wed, 20 Nov 2013 10:12:48 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 196142DD4; Wed, 20 Nov 2013 10:12:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAKAClnm042705; Wed, 20 Nov 2013 10:12:47 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAKAClVD042704; Wed, 20 Nov 2013 10:12:47 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201311201012.rAKAClVD042704@svn.freebsd.org> From: Andriy Gapon Date: Wed, 20 Nov 2013 10:12:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258368 - vendor-sys/illumos/dist/uts/common vendor/illumos/dist/lib/libdtrace/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.16 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: Wed, 20 Nov 2013 10:12:48 -0000 Author: avg Date: Wed Nov 20 10:12:47 2013 New Revision: 258368 URL: http://svnweb.freebsd.org/changeset/base/258368 Log: 3933 contract adoption can race illumos/illumos-gate@a81df0a5d715363cc1841810a87818dfa95675c0 Note we now reference illumos commits in the github repository as the mercurial mirror seems to be neglected. For connectivity: r255255 referenced 14164:dceb17481b99 which is illumos/illumos-gate@69962b5647e4a8b9b14998733b765925381b727e r255258 referenced 14176:15e9457c12ec which is illumos/illumos-gate@cf746768a898264fa491791a8252865e5338dc67 Modified: vendor-sys/illumos/dist/uts/common/Makefile.files Changes in other areas also in this revision: Modified: vendor/illumos/dist/lib/libdtrace/common/dt_print.c Modified: vendor-sys/illumos/dist/uts/common/Makefile.files ============================================================================== --- vendor-sys/illumos/dist/uts/common/Makefile.files Wed Nov 20 09:03:48 2013 (r258367) +++ vendor-sys/illumos/dist/uts/common/Makefile.files Wed Nov 20 10:12:47 2013 (r258368) @@ -146,7 +146,7 @@ GENUNIX_OBJS += \ ddi_intr_impl.o \ ddi_intr_irm.o \ ddi_nodeid.o \ - ddi_timer.o \ + ddi_periodic.o \ devcfg.o \ devcache.o \ device.o \ @@ -1467,6 +1467,23 @@ RPCMOD_OBJS += rpcmod.o clnt_cots.o clnt rpcsys.o xdr_sizeof.o clnt_rdma.o svc_rdma.o \ xdr_rdma.o rdma_subr.o xdrrdma_sizeof.o +KLMMOD_OBJS += klmmod.o \ + nlm_impl.o \ + nlm_rpc_handle.o \ + nlm_dispatch.o \ + nlm_rpc_svc.o \ + nlm_client.o \ + nlm_service.o \ + nlm_prot_clnt.o \ + nlm_prot_xdr.o \ + nlm_rpc_clnt.o \ + nsm_addr_clnt.o \ + nsm_addr_xdr.o \ + sm_inter_clnt.o \ + sm_inter_xdr.o + +KLMOPS_OBJS += klmops.o + TLIMOD_OBJS += tlimod.o t_kalloc.o t_kbind.o t_kclose.o \ t_kconnect.o t_kfree.o t_kgtstate.o t_kopen.o \ t_krcvudat.o t_ksndudat.o t_kspoll.o t_kunbind.o \ @@ -1646,10 +1663,7 @@ K5_KRB= kfree.o copy_key.o \ K5_OS= timeofday.o toffset.o \ init_os_ctx.o c_ustime.o -SEAL= -# EXPORT DELETE START SEAL= seal.o unseal.o -# EXPORT DELETE END MECH= delete_sec_context.o \ import_sec_context.o \