[illumos-gate merge]

commit 77161fd3d75972404d1d4d53237251b3a475f430
    14043 remove obsolete and non-functional localedef headers
commit 94e47c8d78dbdf41e58bb3f5bfe153b43b4ff567
    14057 sun4v/ds: multiply-defined symbols
commit 4596c1d246c665f9dc37ae3bc81d79d966b75bc9
    13864 want 64bit libipmp

Conflicts:
    manifest

13 files changed, 67 insertions, 30 deletions

diff --git a/exception_lists/closed-bins b/exception_lists/closed-bins
index ced3be10b1..fa55ca627c 100644
--- a/exception_lists/closed-bins
+++ b/exception_lists/closed-bins
@@ -65,6 +65,8 @@
 ./usr/has/bin
 ./usr/has/bin/patch
 ./usr/include/sys/agp
+./usr/include/sys/lc_core.h
+./usr/include/sys/localedef.h
 ./usr/include/sys/lvm
 ./usr/include/sys/pcmcia
 ./usr/include/sys/usb/clients/hwarc
diff --git a/manifest b/manifest
index 0316572d13..9acedfc5d7 100644
--- a/manifest
+++ b/manifest
@@ -1309,6 +1309,8 @@ f lib/amd64/libintl.so.1 0755 root bin
 s lib/amd64/libintl.so=libintl.so.1
 f lib/amd64/libipadm.so.1 0755 root bin
 s lib/amd64/libipadm.so=libipadm.so.1
+f lib/amd64/libipmp.so.1 0755 root bin
+s lib/amd64/libipmp.so=libipmp.so.1
 f lib/amd64/libkmf.so.1 0755 root bin
 s lib/amd64/libkmf.so=libkmf.so.1
 f lib/amd64/libkmfberder.so.1 0755 root bin
@@ -4429,7 +4431,6 @@ f usr/include/sys/kstat.h 0644 root bin
 f usr/include/sys/kstr.h 0644 root bin
 f usr/include/sys/ksyms.h 0644 root bin
 f usr/include/sys/ksynch.h 0644 root bin
-f usr/include/sys/lc_core.h 0644 root bin
 f usr/include/sys/ldterm.h 0644 root bin
 f usr/include/sys/lgrp.h 0644 root bin
 f usr/include/sys/lgrp_user.h 0644 root bin
@@ -4442,7 +4443,6 @@ f usr/include/sys/list.h 0644 root bin
 f usr/include/sys/list_impl.h 0644 root bin
 f usr/include/sys/llc1.h 0644 root bin
 f usr/include/sys/loadavg.h 0644 root bin
-f usr/include/sys/localedef.h 0644 root bin
 f usr/include/sys/lock.h 0644 root bin
 f usr/include/sys/lockfs.h 0644 root bin
 f usr/include/sys/lockstat.h 0644 root bin
@@ -5309,6 +5309,8 @@ f usr/lib/amd64/libipd.so.1 0755 root bin
 s usr/lib/amd64/libipd.so=libipd.so.1
 f usr/lib/amd64/libipmi.so.1 0755 root bin
 s usr/lib/amd64/libipmi.so=libipmi.so.1
+f usr/lib/amd64/libipmp.so.1 0755 root bin
+s usr/lib/amd64/libipmp.so=libipmp.so.1
 f usr/lib/amd64/libipp.so.1 0755 root bin
 s usr/lib/amd64/libipp.so=libipp.so.1
 f usr/lib/amd64/libipsecutil.so.1 0755 root bin
diff --git a/usr/src/cmd/ast/libast/amd64/FEATURE/lib b/usr/src/cmd/ast/libast/amd64/FEATURE/lib
index cab2bfea82..b0b6731a21 100644
--- a/usr/src/cmd/ast/libast/amd64/FEATURE/lib
+++ b/usr/src/cmd/ast/libast/amd64/FEATURE/lib
@@ -124,7 +124,6 @@
 #define _mem_dd_fd_DIR	1	/* dd_fd is a member of DIR */
 #define _sys_filio	1	/* #include <sys/filio.h> ok */
 #define _sys_jioctl	1	/* #include <sys/jioctl.h> ok */
-#define _sys_localedef	1	/* #include <sys/localedef.h> ok */
 #define _sys_resource	1	/* #include <sys/resource.h> ok */
 #define _sys_socket	1	/* #include <sys/socket.h> ok */
 #define _sys_stream	1	/* #include <sys/stream.h> ok */
diff --git a/usr/src/cmd/ast/libast/i386/FEATURE/lib b/usr/src/cmd/ast/libast/i386/FEATURE/lib
index ade8e11b3b..4a8e5609f8 100644
--- a/usr/src/cmd/ast/libast/i386/FEATURE/lib
+++ b/usr/src/cmd/ast/libast/i386/FEATURE/lib
@@ -135,7 +135,6 @@
 #define _mem_dd_fd_DIR	1	/* dd_fd is a member of DIR */
 #define _sys_filio	1	/* #include <sys/filio.h> ok */
 #define _sys_jioctl	1	/* #include <sys/jioctl.h> ok */
-#define _sys_localedef	1	/* #include <sys/localedef.h> ok */
 #define _sys_resource	1	/* #include <sys/resource.h> ok */
 #define _sys_socket	1	/* #include <sys/socket.h> ok */
 #define _sys_stream	1	/* #include <sys/stream.h> ok */
diff --git a/usr/src/cmd/ast/libast/sparc/FEATURE/lib b/usr/src/cmd/ast/libast/sparc/FEATURE/lib
index ade8e11b3b..4a8e5609f8 100644
--- a/usr/src/cmd/ast/libast/sparc/FEATURE/lib
+++ b/usr/src/cmd/ast/libast/sparc/FEATURE/lib
@@ -135,7 +135,6 @@
 #define _mem_dd_fd_DIR	1	/* dd_fd is a member of DIR */
 #define _sys_filio	1	/* #include <sys/filio.h> ok */
 #define _sys_jioctl	1	/* #include <sys/jioctl.h> ok */
-#define _sys_localedef	1	/* #include <sys/localedef.h> ok */
 #define _sys_resource	1	/* #include <sys/resource.h> ok */
 #define _sys_socket	1	/* #include <sys/socket.h> ok */
 #define _sys_stream	1	/* #include <sys/stream.h> ok */
diff --git a/usr/src/cmd/ast/libast/sparcv9/FEATURE/lib b/usr/src/cmd/ast/libast/sparcv9/FEATURE/lib
index cab2bfea82..b0b6731a21 100644
--- a/usr/src/cmd/ast/libast/sparcv9/FEATURE/lib
+++ b/usr/src/cmd/ast/libast/sparcv9/FEATURE/lib
@@ -124,7 +124,6 @@
 #define _mem_dd_fd_DIR	1	/* dd_fd is a member of DIR */
 #define _sys_filio	1	/* #include <sys/filio.h> ok */
 #define _sys_jioctl	1	/* #include <sys/jioctl.h> ok */
-#define _sys_localedef	1	/* #include <sys/localedef.h> ok */
 #define _sys_resource	1	/* #include <sys/resource.h> ok */
 #define _sys_socket	1	/* #include <sys/socket.h> ok */
 #define _sys_stream	1	/* #include <sys/stream.h> ok */
diff --git a/usr/src/lib/libipmp/Makefile b/usr/src/lib/libipmp/Makefile
index d15db5b218..0ff0ce78a5 100644
--- a/usr/src/lib/libipmp/Makefile
+++ b/usr/src/lib/libipmp/Makefile
@@ -22,17 +22,33 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2021 Tintri by DDN, Inc.  All rights reserved.
+#
 
 include $(SRC)/lib/Makefile.lib
 
 HDRS =		ipmp.h ipmp_admin.h ipmp_mpathd.h ipmp_query.h ipmp_query_impl.h
 HDRDIR =	common
 SUBDIRS	=	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 POFILE =	libipmp.po
 MSGFILES =	common/ipmp.c
 XGETFLAGS =	-a
 
+TYPECHECK_LIB =	libipmp.so.1
+TYPELIST = \
+	ipmp_addrinfo_t \
+	ipmp_addrlist_t \
+	ipmp_groupinfo_xfer_t \
+	ipmp_grouplist_t \
+	ipmp_ifinfo_xfer_t \
+	ipmp_iflist_t \
+	ipmp_infotype_t \
+	ipmp_targinfo_xfer_t \
+	mi_query_t \
+	mi_result_t
+
 all :=		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
@@ -44,7 +60,7 @@ all clean clobber install: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
-check:		$(CHECKHDRS)
+check:		$(CHECKHDRS) $(TYPECHECK)
 
 $(POFILE):	$(MSGFILES)
 		$(BUILDPO.msgfiles)
diff --git a/usr/src/lib/libipmp/amd64/Makefile b/usr/src/lib/libipmp/amd64/Makefile
new file mode 100644
index 0000000000..32e4b412a0
--- /dev/null
+++ b/usr/src/lib/libipmp/amd64/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 2021, Tintri by DDN. All rights reserved.
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libipmp/sparcv9/Makefile b/usr/src/lib/libipmp/sparcv9/Makefile
new file mode 100644
index 0000000000..32e4b412a0
--- /dev/null
+++ b/usr/src/lib/libipmp/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 2021, Tintri by DDN. All rights reserved.
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf
index 367ebabd39..a7c1f1f7b0 100644
--- a/usr/src/pkg/manifests/system-header.mf
+++ b/usr/src/pkg/manifests/system-header.mf
@@ -1167,7 +1167,6 @@ file path=usr/include/sys/kstat.h
 file path=usr/include/sys/kstr.h
 file path=usr/include/sys/ksyms.h
 file path=usr/include/sys/ksynch.h
-file path=usr/include/sys/lc_core.h
 file path=usr/include/sys/ldterm.h
 file path=usr/include/sys/lgrp.h
 file path=usr/include/sys/lgrp_user.h
@@ -1178,7 +1177,6 @@ file path=usr/include/sys/list.h
 file path=usr/include/sys/list_impl.h
 file path=usr/include/sys/llc1.h
 file path=usr/include/sys/loadavg.h
-file path=usr/include/sys/localedef.h
 file path=usr/include/sys/lock.h
 file path=usr/include/sys/lockfs.h
 file path=usr/include/sys/lofi.h
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 4b3acde4aa..f5a0640ecf 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -211,6 +211,7 @@ file path=lib/$(ARCH64)/libgen.so.1
 file path=lib/$(ARCH64)/libinetutil.so.1
 file path=lib/$(ARCH64)/libintl.so.1
 file path=lib/$(ARCH64)/libipadm.so.1
+file path=lib/$(ARCH64)/libipmp.so.1
 file path=lib/$(ARCH64)/libkmf.so.1
 file path=lib/$(ARCH64)/libkmfberder.so.1
 file path=lib/$(ARCH64)/libkstat.so.1
@@ -633,6 +634,7 @@ link path=lib/$(ARCH64)/libelf.so target=libelf.so.1
 $(i386_ONLY)link path=lib/$(ARCH64)/libfdisk.so target=libfdisk.so.1
 link path=lib/$(ARCH64)/libgen.so target=libgen.so.1
 link path=lib/$(ARCH64)/libintl.so target=libintl.so.1
+link path=lib/$(ARCH64)/libipmp.so target=libipmp.so.1
 link path=lib/$(ARCH64)/libkmf.so target=libkmf.so.1
 link path=lib/$(ARCH64)/libkmfberder.so target=libkmfberder.so.1
 link path=lib/$(ARCH64)/libkstat.so target=libkstat.so.1
diff --git a/usr/src/uts/sun4v/io/ds_drv.c b/usr/src/uts/sun4v/io/ds_drv.c
index b812999005..0c54cfa794 100644
--- a/usr/src/uts/sun4v/io/ds_drv.c
+++ b/usr/src/uts/sun4v/io/ds_drv.c
@@ -55,27 +55,6 @@
 #include <sys/ds_impl.h>
 
 /*
- * All DS ports in the system
- *
- * The list of DS ports is read in from the MD when the DS module is
- * initialized and is never modified. This eliminates the need for
- * locking to access the port array itself. Access to the individual
- * ports are synchronized at the port level.
- */
-ds_port_t	ds_ports[DS_MAX_PORTS];
-ds_portset_t	ds_allports;	/* all DS ports in the system */
-
-/*
- * Table of registered services
- *
- * Locking: Accesses to the table of services are synchronized using
- *   a mutex lock. The reader lock must be held when looking up service
- *   information in the table. The writer lock must be held when any
- *   service information is being modified.
- */
-ds_svcs_t	ds_svcs;
-
-/*
  * Taskq for internal task processing
  */
 static taskq_t *ds_taskq;
diff --git a/usr/src/uts/sun4v/sys/ds_impl.h b/usr/src/uts/sun4v/sys/ds_impl.h
index 00e8ba7680..04bdd3704c 100644
--- a/usr/src/uts/sun4v/sys/ds_impl.h
+++ b/usr/src/uts/sun4v/sys/ds_impl.h
@@ -215,6 +215,8 @@ typedef struct ds_port {
 
 typedef ulong_t ds_portset_t[DS_PORTSET_SIZE];
 
+extern ds_port_t ds_ports[DS_MAX_PORTS];
+extern ds_portset_t ds_allports;
 extern ds_portset_t ds_nullport;
 
 #define	DS_PORTID_INVALID		((uint64_t)-1)
@@ -340,6 +342,8 @@ typedef struct ds_svcs {
 /* enable/disable taskq processing */
 extern boolean_t ds_enabled;
 
+extern ds_svcs_t ds_svcs;
+
 /*
  * DS Message Logging
  *