[illumos-gate merge]

commit 72102e7461c97dc268d21d9dd8f02da45f174acd
    3928 `tail -f ...` doesn't notice file truncation
    3929 `man tail` doesn't mentioned "-F" option
    3930 'tail -F ...' not resetting the offset of file rotation properly
    3968 want FILE_TRUNC event for PORT_SOURCE_FILE
commit b3d32f0ceb59362ba287dcfd6de471e98bfc7fa9
    4161 deadlock between zfs_read() and zfs_putpage()
commit 5a450eee20035a2a426a48161ab3a50e2921878c
    4244 spawn fails occasionally with EAGAIN
commit 393cba3d826b7fd70b8ab083125c4b25c43ee482
    4116 kiconv_open(9f): kiconv_close() in the CONTEXT section
commit 86ad481cc8bfbc0155ef221a0fe07ef23db58f68
    4245 boot_time kstat for zones should be epoch timestamp of zone boot, not "random" number
commit fe77cc0407fb667ddc04e1a8f2e203bb7b9c80e1
    4236 Internet Packet Disturber
    4237 net_* and hook_* man pages are wrong
commit 54a20ab41aadcb81c53e72fc65886e964e9add59
    4248 dtrace(1M) should never create DOF with empty probes section
    4249 Only probes from the first DTrace object file will be included

Conflicts:
	usr/src/uts/intel/ipd/Makefile
	usr/src/uts/common/vm/as.h
	usr/src/uts/common/sys/ipd.h
	usr/src/uts/common/inet/ipd/ipd.conf
	usr/src/uts/common/inet/ipd/ipd.c
	usr/src/uts/common/fs/tmpfs/tmp_vnops.c
	usr/src/man/man1m/Makefile
	usr/src/lib/libipd/common/mapfile-vers
	usr/src/lib/libdtrace/common/dt_impl.h
	usr/src/lib/libdtrace/common/dt_error.c
	usr/src/cmd/tail/extern.h
	usr/src/cmd/ipdadm/ipdadm.c
	usr/src/cmd/ipdadm/Makefile
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
	usr/src/cmd/Makefile

18 files changed, 210 insertions, 102 deletions

diff --git a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
index eb0eb42144..7def9ed2ab 100644
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
@@ -64,7 +64,7 @@ provider $oogle {
 };
 EOF
 
-	gcc -m32 -c $oogle.c
+	cc -c $oogle.c
 
 	if [ $? -ne 0 ]; then
 		print -u2 "failed to compile $oogle.c"
@@ -87,7 +87,7 @@ echo "}" >> test.c
 
 echo 'END{printa("%-10s %@d\\n", @)}' >> test.d
 
-gcc -m32 -o test test.c $objs
+cc -o test test.c $objs
 
 if [ $? -ne 0 ]; then
 	print -u2 "failed to compile test.c"
diff --git a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
index d7071c0c69..a43970f560 100644
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
@@ -46,7 +46,7 @@ provider doogle {
 };
 EOF
 
-gcc -c test.c
+cc -c test.c
 $dtrace -G -32 -s doogle.d test.o -o doogle.d.o
 
 if [ $? -eq 0 ]; then
diff --git a/usr/src/cmd/ipdadm/Makefile b/usr/src/cmd/ipdadm/Makefile
index 96051c38d3..349899e5f6 100644
--- a/usr/src/cmd/ipdadm/Makefile
+++ b/usr/src/cmd/ipdadm/Makefile
@@ -1,22 +1,12 @@
 #
-# CDDL HEADER START
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
 #
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
 
 #
@@ -39,7 +29,7 @@ LDLIBS += -lipd
 
 $(PROG): $(OBJS)
 	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
-	$(CTFCONVERT_O)
+	$(POST_PROCESS)
 
 clean:
 	-$(RM) $(CLEANFILES)
@@ -48,6 +38,7 @@ lint: lint_PROG
 
 %.o: ../%.c
 	$(COMPILE.c) $<
+	$(POST_PROCESS_O)
 
 install: $(PROG) $(ROOTUSRSBINPROG)
 
diff --git a/usr/src/cmd/ipdadm/ipdadm.c b/usr/src/cmd/ipdadm/ipdadm.c
index 61020ecd4c..ca68541690 100644
--- a/usr/src/cmd/ipdadm/ipdadm.c
+++ b/usr/src/cmd/ipdadm/ipdadm.c
@@ -1,24 +1,15 @@
 /*
- * CDDL HEADER START
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
+
 /*
  * Copyright (c) 2012 Joyent, Inc.  All rights reserved.
  * Use is subject to license terms.
diff --git a/usr/src/cmd/tail/extern.h b/usr/src/cmd/tail/extern.h
index 2f049749d7..7f121b2d9d 100644
--- a/usr/src/cmd/tail/extern.h
+++ b/usr/src/cmd/tail/extern.h
@@ -28,11 +28,13 @@
  *
  */
 
+#ifndef	_TAIL_EXTERN_H
+#define	_TAIL_EXTERN_H
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <port.h>
 
-
 #define	WR(p, size) do { \
 	if (write(STDOUT_FILENO, p, size) != (ssize_t)size) \
 		oerr(); \
@@ -72,3 +74,5 @@ int mapprint(struct mapinfo *, off_t, off_t);
 int maparound(struct mapinfo *, off_t);
 
 extern int Fflag, fflag, qflag, rflag, rval, no_files;
+
+#endif	/* _TAIL_EXTERN_H */
diff --git a/usr/src/lib/libdtrace/common/dt_error.c b/usr/src/lib/libdtrace/common/dt_error.c
index d822e2d420..abac5b11d1 100644
--- a/usr/src/lib/libdtrace/common/dt_error.c
+++ b/usr/src/lib/libdtrace/common/dt_error.c
@@ -111,7 +111,7 @@ static const struct {
 	{ EDT_OVERSION,	"Client requested deprecated version of library" },
 	{ EDT_ENABLING_ERR, "Failed to enable probe" },
 	{ EDT_NOPROBES, "No probe sites found for declared provider" },
-	{ EDT_CANTLOAD, "Failed to load module" },
+	{ EDT_CANTLOAD, "Failed to load module" }
 };
 
 static const int _dt_nerr = sizeof (_dt_errlist) / sizeof (_dt_errlist[0]);
diff --git a/usr/src/lib/libipd/common/mapfile-vers b/usr/src/lib/libipd/common/mapfile-vers
index fec8c56859..91c4632dea 100644
--- a/usr/src/lib/libipd/common/mapfile-vers
+++ b/usr/src/lib/libipd/common/mapfile-vers
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2011 <contributor>.  All rights reserved.
+# Copyright (c) 2012 Joyent, Inc.  All rights reserved.
 #
 
 #
diff --git a/usr/src/lib/libipd/sparc/Makefile b/usr/src/lib/libipd/sparc/Makefile
new file mode 100644
index 0000000000..6a668fb98f
--- /dev/null
+++ b/usr/src/lib/libipd/sparc/Makefile
@@ -0,0 +1,18 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2012 Joyent, Inc.  All rights reserved.
+#
+
+include ../Makefile.com
+
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libipd/sparcv9/Makefile b/usr/src/lib/libipd/sparcv9/Makefile
new file mode 100644
index 0000000000..0ff7206916
--- /dev/null
+++ b/usr/src/lib/libipd/sparcv9/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2012 Joyent, Inc.  All rights reserved.
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
diff --git a/usr/src/man/man1m/Makefile b/usr/src/man/man1m/Makefile
index 3fc0819aa1..b3b9bdc02c 100644
--- a/usr/src/man/man1m/Makefile
+++ b/usr/src/man/man1m/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2011, Richard Lowe
+# Copyright (c) 2012, Joyent, Inc.  All rights reserved.
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2012 Joyent, Inc. All rights reserved.
 #
@@ -238,7 +239,7 @@ _MANFILES=	6to4relay.1m		\
 		iostat.1m		\
 		ipaddrsel.1m		\
 		ipadm.1m		\
- 	 	ipdadm.1m		\
+		ipdadm.1m		\
 		ipf.1m			\
 		ipfs.1m			\
 		ipfstat.1m		\
diff --git a/usr/src/man/man9f/kiconv_open.9f b/usr/src/man/man9f/kiconv_open.9f
index dd613c7bff..344bff45ec 100644
--- a/usr/src/man/man9f/kiconv_open.9f
+++ b/usr/src/man/man9f/kiconv_open.9f
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH KICONV_OPEN 9F "Oct 16, 2007"
+.TH KICONV_OPEN 9F "Nov 5, 2013"
 .SH NAME
 kiconv_open \- code conversion descriptor allocation function
 .SH SYNOPSIS
@@ -152,7 +152,7 @@ any other reasons the code conversion descriptor cannot be allocated,
 .SH CONTEXT
 .sp
 .LP
-\fBkiconv_close()\fR can be called from user context only.
+\fBkiconv_open()\fR can be called from user context only.
 .SH EXAMPLES
 .LP
 \fBExample 1 \fROpening a Code Conversion
diff --git a/usr/src/pkg/manifests/network-ipd.mf b/usr/src/pkg/manifests/network-ipd.mf
new file mode 100644
index 0000000000..01e2a41bec
--- /dev/null
+++ b/usr/src/pkg/manifests/network-ipd.mf
@@ -0,0 +1,46 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013  by Delphix. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/network/ipd@$(PKGVERS)
+set name=pkg.description value="Internet Packet Disturber"
+set name=pkg.summary value="Internet Packet Disturber"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Hardware
+set name=variant.arch value=$(ARCH)
+dir path=kernel group=sys
+dir path=kernel/drv group=sys
+dir path=kernel/drv/$(ARCH64) group=sys
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/$(ARCH64)
+dir path=usr/sbin
+dir path=usr/share/man/man1m
+driver name=ipd perms="* 0600 root sys"
+file path=kernel/drv/$(ARCH64)/ipd group=sys
+$(i386_ONLY)file path=kernel/drv/ipd group=sys
+file path=kernel/drv/ipd.conf group=sys
+file path=usr/include/libipd.h
+file path=usr/include/sys/ipd.h
+file path=usr/lib/$(ARCH64)/libipd.so.1
+file path=usr/lib/$(ARCH64)/llib-lipd.ln
+file path=usr/lib/libipd.so.1
+file path=usr/lib/llib-lipd
+file path=usr/lib/llib-lipd.ln
+file path=usr/sbin/ipdadm mode=0555
+file path=usr/share/man/man1m/ipdadm.1m
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+link path=usr/lib/$(ARCH64)/libipd.so target=libipd.so.1
+link path=usr/lib/libipd.so target=libipd.so.1
diff --git a/usr/src/uts/common/inet/ipd/ipd.c b/usr/src/uts/common/inet/ipd/ipd.c
index fbb1d07a5a..5029a5bb10 100644
--- a/usr/src/uts/common/inet/ipd/ipd.c
+++ b/usr/src/uts/common/inet/ipd/ipd.c
@@ -1,22 +1,12 @@
 /*
- * CDDL HEADER START
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 /*
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
@@ -159,6 +149,12 @@
  */
 
 #include <sys/types.h>
+#include <sys/file.h>
+#include <sys/errno.h>
+#include <sys/open.h>
+#include <sys/cred.h>
+#include <sys/ddi.h>
+#include <sys/sunddi.h>
 #include <sys/kmem.h>
 #include <sys/conf.h>
 #include <sys/stat.h>
diff --git a/usr/src/uts/common/inet/ipd/ipd.conf b/usr/src/uts/common/inet/ipd/ipd.conf
index 83b9b685f4..ddf16977cb 100644
--- a/usr/src/uts/common/inet/ipd/ipd.conf
+++ b/usr/src/uts/common/inet/ipd/ipd.conf
@@ -1,24 +1,14 @@
 #
-# CDDL HEADER START
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
 #
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
+
 #
 # Copyright (c) 2012 Joyent, Inc.  All rights reserved.
 # Use is subject to license terms.
diff --git a/usr/src/uts/common/sys/ipd.h b/usr/src/uts/common/sys/ipd.h
index 901e74f44c..bad74f8b81 100644
--- a/usr/src/uts/common/sys/ipd.h
+++ b/usr/src/uts/common/sys/ipd.h
@@ -35,7 +35,7 @@ extern "C" {
 #endif
 
 #define	IPD_DEV_PATH	"/dev/ipd"
-#define	IPD_MAX_DELAY	1000000		/* 1s in us */
+#define	IPD_MAX_DELAY	10000		/* 10 ms in us */
 
 typedef struct ipd_ioc_perturb {
 	zoneid_t	ipip_zoneid;
diff --git a/usr/src/uts/common/vm/as.h b/usr/src/uts/common/vm/as.h
index 1689401433..d70c655f9c 100644
--- a/usr/src/uts/common/vm/as.h
+++ b/usr/src/uts/common/vm/as.h
@@ -228,13 +228,24 @@ enum as_cbdelete_rc {
 extern struct as kas;		/* kernel's address space */
 
 /*
- * Macros for address space locking.
+ * Macros for address space locking.  Note that we use RW_READER_STARVEWRITER
+ * whenever we acquire the address space lock as reader to assure that it can
+ * be used without regard to lock order in conjunction with filesystem locks.
+ * This allows filesystems to safely induce user-level page faults with
+ * filesystem locks held while concurrently allowing filesystem entry points
+ * acquiring those same locks to be called with the address space lock held as
+ * reader.  RW_READER_STARVEWRITER thus prevents reader/reader+RW_WRITE_WANTED
+ * deadlocks in the style of fop_write()+as_fault()/as_*()+fop_putpage() and
+ * fop_read()+as_fault()/as_*()+fop_getpage().  (See the Big Theory Statement
+ * in rwlock.c for more information on the semantics of and motivation behind
+ * RW_READER_STARVEWRITER.)
  */
-#define	AS_LOCK_ENTER(as, lock, type)		\
-	rw_enter((lock), (type) == RW_READER ? RW_READER_STARVEWRITER : (type))
+#define	AS_LOCK_ENTER(as, lock, type)		rw_enter((lock), \
+	(type) == RW_READER ? RW_READER_STARVEWRITER : (type))
 #define	AS_LOCK_EXIT(as, lock)			rw_exit((lock))
 #define	AS_LOCK_DESTROY(as, lock)		rw_destroy((lock))
-#define	AS_LOCK_TRYENTER(as, lock, type)	rw_tryenter((lock), (type))
+#define	AS_LOCK_TRYENTER(as, lock, type)	rw_tryenter((lock), \
+	(type) == RW_READER ? RW_READER_STARVEWRITER : (type))
 
 /*
  * Macros to test lock states.
diff --git a/usr/src/uts/intel/ipd/Makefile b/usr/src/uts/intel/ipd/Makefile
index 1bb76d0728..27a0b6b79c 100644
--- a/usr/src/uts/intel/ipd/Makefile
+++ b/usr/src/uts/intel/ipd/Makefile
@@ -1,24 +1,14 @@
 #
-# CDDL HEADER START
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
 #
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
+
 #
 # Copyright 2012 Joyent, Inc.  All rights reserved.
 # Use is subject to license terms.
diff --git a/usr/src/uts/sparc/ipd/Makefile b/usr/src/uts/sparc/ipd/Makefile
new file mode 100644
index 0000000000..27a0b6b79c
--- /dev/null
+++ b/usr/src/uts/sparc/ipd/Makefile
@@ -0,0 +1,51 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2012 Joyent, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+UTSBASE	= ../..
+
+MODULE		= ipd
+OBJECTS		= $(IPD_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(IPD_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/inet/ipd
+
+include $(UTSBASE)/intel/Makefile.intel
+
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+LDFLAGS += -dy -Nmisc/neti -Nmisch/hook
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+include $(UTSBASE)/intel/Makefile.targ