Mercurial > unleashed
changeset 20611:ae7db3ea55e1
Merge illumos-gate
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Sun, 19 May 2019 23:33:53 -0400 |
| parents | 7616bf36dcb7 (current diff) 572cb5c6c584 (diff) |
| children | dd8ccd3b5f83 |
| files | arch/x86/kernel/dboot/dboot_startkern.c usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile usr/src/cmd/ptools/Makefile.bld usr/src/cmd/sgs/include/conv.h |
| diffstat | 6 files changed, 13 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/arch/x86/kernel/dboot/dboot_startkern.c Sun May 19 22:05:19 2019 -0400 +++ b/arch/x86/kernel/dboot/dboot_startkern.c Sun May 19 23:33:53 2019 -0400 @@ -1072,7 +1072,7 @@ modules[midx].bm_type = BMT_ENV; } else if (strcmp(q, "file") != 0) { dboot_printf("\tmodule #%d: unknown module " - "type '%s'; defaulting to 'file'", + "type '%s'; defaulting to 'file'\n", midx, q); } continue;
--- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile Sun May 19 22:05:19 2019 -0400 +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile Sun May 19 23:33:53 2019 -0400 @@ -45,9 +45,9 @@ include ../../../Makefile.cmd -CERRWARN += -_gcc=-Wno-unused-variable -CERRWARN += -_gcc=-Wno-implicit-function-declaration -CERRWARN += -_gcc=-Wno-uninitialized +CERRWARN += -Wno-unused-variable +CERRWARN += -Wno-implicit-function-declaration +CERRWARN += -Wno-uninitialized # not linted SMATCH=off
--- a/usr/src/cmd/mdb/intel/mdb/proc_amd64dep.c Sun May 19 22:05:19 2019 -0400 +++ b/usr/src/cmd/mdb/intel/mdb/proc_amd64dep.c Sun May 19 23:33:53 2019 -0400 @@ -24,7 +24,7 @@ * Use is subject to license terms. */ /* - * Copyright 2015 Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -74,9 +74,9 @@ { "r10w", REG_R10, MDB_TGT_R_EXPORT | MDB_TGT_R_16 }, { "r10l", REG_R10, MDB_TGT_R_EXPORT | MDB_TGT_R_8L }, { "r9", REG_R9, MDB_TGT_R_EXPORT }, - { "r9d", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_32 }, - { "r9w", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_16 }, - { "r9l", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_8L }, + { "r9d", REG_R9, MDB_TGT_R_EXPORT | MDB_TGT_R_32 }, + { "r9w", REG_R9, MDB_TGT_R_EXPORT | MDB_TGT_R_16 }, + { "r9l", REG_R9, MDB_TGT_R_EXPORT | MDB_TGT_R_8L }, { "r8", REG_R8, MDB_TGT_R_EXPORT }, { "r8d", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_32 }, { "r8w", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_16 },
--- a/usr/src/cmd/ptools/Makefile.bld Sun May 19 22:05:19 2019 -0400 +++ b/usr/src/cmd/ptools/Makefile.bld Sun May 19 23:33:53 2019 -0400 @@ -70,8 +70,6 @@ CERRWARN_pargs += -Wno-clobbered CERRWARN_pargs += -Wno-type-limits -CERRWARN_pwait += -_smatch=off - CERRWARN += $(CERRWARN_$(PROG)) # pargs depends on ../../common/elfcap components
--- a/usr/src/cmd/sgs/include/conv.h Sun May 19 22:05:19 2019 -0400 +++ b/usr/src/cmd/sgs/include/conv.h Sun May 19 23:33:53 2019 -0400 @@ -25,6 +25,7 @@ * * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 DEY Storage Systems, Inc. All rights reserved. + * Copyright (c) 2018, Joyent, Inc. * Copyright 2016 RackTop Systems. */ @@ -170,7 +171,7 @@ char buf[CONV_CAP_VAL_HW1_BUFSIZE]; } Conv_cap_val_hw1_buf_t; -#define CONV_CAP_VAL_HW2_BUFSIZE CONV_INV_BUFSIZE /* for now */ +#define CONV_CAP_VAL_HW2_BUFSIZE 350 typedef union { Conv_inv_buf_t inv_buf; char buf[CONV_CAP_VAL_HW2_BUFSIZE];
--- a/usr/src/common/elfcap/elfcap.c Sun May 19 22:05:19 2019 -0400 +++ b/usr/src/common/elfcap/elfcap.c Sun May 19 23:33:53 2019 -0400 @@ -21,7 +21,7 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2017, Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* LINTLIBRARY */ @@ -377,8 +377,8 @@ STRDESC("AVX512VBMI"), STRDESC("avx512vbmi"), }, { /* 0x00020000 */ - AV_386_2_AVX512VPOPCDQ, STRDESC("AV_386_2_AVX512VPOPCDQ"), - STRDESC("AVX512VPOPCDQ"), STRDESC("avx512_vpopcntdq"), + AV_386_2_AVX512VPOPCDQ, STRDESC("AV_386_2_AVX512_VPOPCDQ"), + STRDESC("AVX512_VPOPCDQ"), STRDESC("avx512_vpopcntdq"), }, { /* 0x00040000 */ AV_386_2_AVX512_4NNIW, STRDESC("AV_386_2_AVX512_4NNIW"),