[illumos-gate merge]

commit 15276eb5b5c891978242f14352c27676ed336244
    13704 add Ice Lake Xeon to PPIN list
    13705 add recent Intel models to x86_archext.h
commit 6dcbfae4aa2c2aab7ebd7174bd2f0232528126b7
    13201 IPS image re-hydration fails
commit 8222814ef8560ee0ba222eca8ca5acffc6cd0e44
    13487 want mapfile-based assertions about symbol properties
commit 99ea293e719ac006d413e4fde6ac0d5cd4dd6c59
    7668 zfs get only outputs 3 columns if "clones" property is empty

Conflicts:
    usr/src/lib/libzfs/common/mapfile-vers

1 files changed, 205 insertions, 35 deletions

diff --git a/usr/src/lib/libtnfprobe/mapfile-vers b/usr/src/lib/libtnfprobe/mapfile-vers
index bcee4b1a23..e0be7e0492 100644
--- a/usr/src/lib/libtnfprobe/mapfile-vers
+++ b/usr/src/lib/libtnfprobe/mapfile-vers
@@ -40,7 +40,7 @@ $mapfile_version 2
 
 SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	fork				{ FLAGS = NODIRECT };
+	fork				{ FLAGS = NODIRECT; };
 	fork1;
 	pthread_create;
 	pthread_exit;
@@ -48,59 +48,229 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	thr_create;
 	thr_exit;
 	tnf_allocate;
-	tnf_char_tag_data;
-	tnf_float32_tag_data;
-	tnf_float64_tag_data;
-	tnf_int16_tag_data;
-	tnf_int32_tag_data;
-	tnf_int64_tag_data;
-	tnf_int8_tag_data;
-	tnf_lwpid_tag_data;
-	tnf_name_tag_data;
-	tnf_non_threaded_test_addr;
-	tnf_opaque_tag_data;
-	tnf_pid_tag_data;
+	tnf_char_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_float32_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_float64_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_int16_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_int32_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_int64_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_int8_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_lwpid_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_name_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_non_threaded_test_addr	{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_opaque_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_pid_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
 	__tnf_probe_alloc;
 	tnf_probe_debug;
-	tnf_probe_event_tag_data;
+	tnf_probe_event_tag_data	{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
 	tnf_probe_get_arg_indexed;
 	tnf_probe_get_chars;
 	tnf_probe_get_num_args;
 	tnf_probe_get_type_indexed;
 	tnf_probe_get_value;
-	__tnf_probe_list_head;
-	__tnf_probe_list_valid;
-	__tnf_probe_memseg_p;
+	__tnf_probe_list_head		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	__tnf_probe_list_valid		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = 4;
+						};
+					};
+	__tnf_probe_memseg_p		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
 	__tnf_probe_notify;
-	__tnf_probe_thr_sync;
-	__tnf_probe_version_1_info;
+	__tnf_probe_thr_sync		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	__tnf_probe_version_1_info	{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize[2];
+						};
+					};
 	tnf_process_disable;
 	tnf_process_enable;
 	tnf_ref32_1;
-	tnf_size_tag_data;
+	tnf_size_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
 	tnf_string_1;
-	tnf_string_tag_data;
+	tnf_string_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
 	tnf_struct_tag_1;
-	tnf_tag_tag_data;
-	__tnf_tag_version_1_info;
+	tnf_tag_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	__tnf_tag_version_1_info	{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize[2];
+						};
+					};
 	tnf_thread_disable;
-	tnf_threaded_test_addr;
+	tnf_threaded_test_addr		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
 	tnf_thread_enable;
-	tnf_time_base_tag_data;
-	tnf_time_delta_tag_data;
+	tnf_time_base_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_time_delta_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
 	tnf_trace_alloc;
 	tnf_trace_commit;
 	tnf_trace_end;
-	tnf_trace_file_min;
-	tnf_trace_file_name;
-	tnf_trace_file_size;
+	tnf_trace_file_min		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = 4;
+						};
+					};
+	tnf_trace_file_name		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = 1024;
+						};
+					};
+	tnf_trace_file_size		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = 4;
+						};
+					};
 	tnf_trace_rollback;
-	tnf_uint16_tag_data;
-	tnf_uint32_tag_data;
-	tnf_uint64_tag_data;
-	tnf_uint8_tag_data;
-	tnf_user_struct_properties;
-	_tnfw_b_control;
+	tnf_uint16_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_uint32_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_uint64_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_uint8_tag_data		{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	tnf_user_struct_properties	{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
+	_tnfw_b_control			{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize;
+						};
+					};
 
 $if _sparc
 	thr_stksegment;