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 \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
