diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-04-26 09:20:11 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-04-26 09:20:11 -0400 |
| commit | 03c3903fbeb5f78f5d8fc6368cde5646238cd49c (patch) | |
| tree | ddf94f11ff64b67898287e721e8a1c09d5bc3de0 | |
| parent | 40567c7df713b4b234e24851b84dac6e1ac8d97b (diff) | |
| parent | ce9221f7c49d15d77c5f2958868f3319f95c7a06 (diff) | |
| download | illumos-joyent-03c3903fbeb5f78f5d8fc6368cde5646238cd49c.tar.gz | |
[illumos-gate merge]
commit ce9221f7c49d15d77c5f2958868f3319f95c7a06
14650 remove smatch gag from viona
commit 43f863f959a7ec8a6ee3645d33997561ff808c39
14621 Missing dependency in cores tests build
6 files changed, 18 insertions, 6 deletions
diff --git a/usr/src/test/os-tests/tests/cores/libdumper/Makefile.com b/usr/src/test/os-tests/tests/cores/libdumper/Makefile.com index 3a985d3965..4223aa0896 100644 --- a/usr/src/test/os-tests/tests/cores/libdumper/Makefile.com +++ b/usr/src/test/os-tests/tests/cores/libdumper/Makefile.com @@ -33,6 +33,11 @@ SRCDIR = ../common # STRIP_STABS = /bin/true +$(ROOTOPTDIR): + $(INS.dir) + +$(ROOTLIBDIR): $(ROOTOPTDIR) + $(INS.dir) $(ROOTLIBDIR64): $(ROOTLIBDIR) $(INS.dir) diff --git a/usr/src/test/os-tests/tests/cores/libdumper/amd64/Makefile b/usr/src/test/os-tests/tests/cores/libdumper/amd64/Makefile index 09690cb7b3..483ddb6a8f 100644 --- a/usr/src/test/os-tests/tests/cores/libdumper/amd64/Makefile +++ b/usr/src/test/os-tests/tests/cores/libdumper/amd64/Makefile @@ -16,4 +16,7 @@ include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) + +$(ROOTLIBS64): $(ROOTLIBDIR64) +$(ROOTLINKS64): $(ROOTLIBS64) diff --git a/usr/src/test/os-tests/tests/cores/libdumper/i386/Makefile b/usr/src/test/os-tests/tests/cores/libdumper/i386/Makefile index 0af99e030c..38d02577c8 100644 --- a/usr/src/test/os-tests/tests/cores/libdumper/i386/Makefile +++ b/usr/src/test/os-tests/tests/cores/libdumper/i386/Makefile @@ -16,3 +16,6 @@ include ../Makefile.com install: all $(ROOTLIBS) $(ROOTLINKS) + +$(ROOTLIBS): $(ROOTLIBDIR) +$(ROOTLINKS): $(ROOTLIBS) diff --git a/usr/src/test/os-tests/tests/cores/secmapper/Makefile b/usr/src/test/os-tests/tests/cores/secmapper/Makefile index 84a28a56b8..1834eee09b 100644 --- a/usr/src/test/os-tests/tests/cores/secmapper/Makefile +++ b/usr/src/test/os-tests/tests/cores/secmapper/Makefile @@ -41,7 +41,7 @@ $(PROG): $(OBJS) install: $(ROOTOPTPROGS) -$(ROOTOPTPROGS): $(PROG) +$(ROOTOPTPROGS): $(ROOTOPTCORE) $(PROG) FRC: diff --git a/usr/src/uts/intel/io/viona/viona_tx.c b/usr/src/uts/intel/io/viona/viona_tx.c index 424deee498..277ee521a1 100644 --- a/usr/src/uts/intel/io/viona/viona_tx.c +++ b/usr/src/uts/intel/io/viona/viona_tx.c @@ -699,7 +699,11 @@ viona_tx(viona_link_t *link, viona_vring_t *ring) * guest can't run concurrently. */ smt_begin_unsafe(); - mac_tx(link_mch, mp_head, 0, MAC_DROP_ON_NO_DESC, NULL); + /* + * Ignore, for now, any signal from MAC about whether the outgoing + * packet was dropped or not. + */ + (void) mac_tx(link_mch, mp_head, 0, MAC_DROP_ON_NO_DESC, NULL); smt_end_unsafe(); return; diff --git a/usr/src/uts/intel/viona/Makefile b/usr/src/uts/intel/viona/Makefile index a09dbbe9e9..6a38bbaf9e 100644 --- a/usr/src/uts/intel/viona/Makefile +++ b/usr/src/uts/intel/viona/Makefile @@ -28,9 +28,6 @@ include $(UTSBASE)/intel/Makefile.intel ALL_TARGET = $(BINARY) $(SRC_CONFILE) INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -# needs work -SMOFF += all_func_returns - ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) |