summaryrefslogtreecommitdiff
path: root/usr/src/Targetdirs
diff options
context:
space:
mode:
authorDan McDonald <danmcd@mnx.io>2022-05-13 11:03:26 -0400
committerDan McDonald <danmcd@mnx.io>2022-05-13 11:03:26 -0400
commit37dd26ec6ee052126fde7d953731ec587312f02a (patch)
tree75e828d9e87b6e82c1d12be2897080345624fc6a /usr/src/Targetdirs
parentb5d958ab09b01b8106eef35f27dd54bde6d9bc53 (diff)
parentb518543be8042a5a0dda9b983f71c4a99d74ad99 (diff)
downloadillumos-joyent-37dd26ec6ee052126fde7d953731ec587312f02a.tar.gz
[illumos-gate merge]
commit b518543be8042a5a0dda9b983f71c4a99d74ad99 14603 bhyve passthrough mishandles combined CMD/STATUS reads commit d7b72f7b52f902da47cc7210a9121f4caabbcb9c 14578 bhyve upstream sync 2022 March 14493 Three small memory leaks in bhyve Conflicts: usr/src/Targetdirs
Diffstat (limited to 'usr/src/Targetdirs')
-rw-r--r--usr/src/Targetdirs4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index 0c8055062b..79d2990e95 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -28,7 +28,7 @@
# Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
# Copyright 2017 Nexenta Systems, Inc.
# Copyright 2017 RackTop Systems.
-# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2020 Joyent, Inc.
#
@@ -62,7 +62,7 @@ i386_DIRS= \
/usr/lib/xen/bin \
/usr/share/bhyve
-sparc_DIRS= \
+sparc_DIRS= \
/usr/lib/ldoms
sparc_64ONLY= $(POUND_SIGN)