diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-21 11:37:38 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-21 11:37:38 +0000 |
| commit | 1f6ef55bbc34d163d8228af4d5c128e1e5a5c4db (patch) | |
| tree | 65f28c2feeba47e4d9cf91d6e9338c9144fa40e5 /usr/src | |
| parent | 57c0e380ed72a56089c9606e37cabd0c30ba2006 (diff) | |
| parent | 629c07fb6e3f1db7dc0b6e1647ee779f6aaef329 (diff) | |
| download | illumos-joyent-1f6ef55bbc34d163d8228af4d5c128e1e5a5c4db.tar.gz | |
[illumos-gate merge]
commit 629c07fb6e3f1db7dc0b6e1647ee779f6aaef329
12526 Could combine misc_link_i386.c handlers
commit e1086107dcddb40ce490ac7c851716c9e1d7796d
12579 parallelize crypto-test build
Conflicts:
usr/src/cmd/devfsadm/i386/misc_link_i386.c
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/devfsadm/i386/misc_link_i386.c | 2 | ||||
| -rw-r--r-- | usr/src/test/crypto-tests/tests/Makefile.crypto | 2 | ||||
| -rw-r--r-- | usr/src/test/crypto-tests/tests/digest/Makefile | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/cmd/devfsadm/i386/misc_link_i386.c b/usr/src/cmd/devfsadm/i386/misc_link_i386.c index 6b21eabe3b..eb5f789c37 100644 --- a/usr/src/cmd/devfsadm/i386/misc_link_i386.c +++ b/usr/src/cmd/devfsadm/i386/misc_link_i386.c @@ -135,7 +135,7 @@ static devfsadm_remove_t misc_remove_cbt[] = { DEVFSADM_REMOVE_INIT_V0(misc_remove_cbt); /* - * Any /dev/foo named named after the minor name such as + * Any /dev/foo entry named after the minor name such as * /devices/.../driver@0:foo */ static int diff --git a/usr/src/test/crypto-tests/tests/Makefile.crypto b/usr/src/test/crypto-tests/tests/Makefile.crypto index 8d7396fa64..f53bd7d89b 100644 --- a/usr/src/test/crypto-tests/tests/Makefile.crypto +++ b/usr/src/test/crypto-tests/tests/Makefile.crypto @@ -96,6 +96,8 @@ clean: $(CMDS): $(TESTDIR_pkcs) $(TESTDIR_kcf) $(PROGS) +.PARALLEL: $(CMDS) $(PROGS) + $(TESTDIR_pkcs) $(TESTDIR_kcf): $(INS.dir) diff --git a/usr/src/test/crypto-tests/tests/digest/Makefile b/usr/src/test/crypto-tests/tests/digest/Makefile index a5732aa375..c381d0c584 100644 --- a/usr/src/test/crypto-tests/tests/digest/Makefile +++ b/usr/src/test/crypto-tests/tests/digest/Makefile @@ -27,4 +27,6 @@ all clean clobber install: $(ALGS) $(ALGS): FRC $(MAKE) -e -f Makefile.digest BASEPROG=$@ $(TARGET) +.PARALLEL: $(ALGS) + FRC: |