diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-03-12 13:07:32 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-03-12 13:07:32 +0000 |
| commit | 92a39a923b206d3a9b8174d383717e25bddd3f99 (patch) | |
| tree | 0e38a89f0efa1d50036371c4adac89c7f8a938e7 /usr/src/uts/intel/Makefile.intel | |
| parent | 4ad2b82f02940919076bbd75002408a5bfef6a80 (diff) | |
| parent | b13f152e9f7bf4b4426892b07a35568bd4d9e17f (diff) | |
| download | illumos-joyent-92a39a923b206d3a9b8174d383717e25bddd3f99.tar.gz | |
[illumos-gate merge]
commit b13f152e9f7bf4b4426892b07a35568bd4d9e17f
9251 p123_pcbe is useless and can be removed
commit 2d63d7e2e0f22bde6326636e6558471d35de3daa
9175 smbsrv/libfksmbsrv: this statement may fall through
commit f3195b6f398987f2aa5ba77d68c880a1dbc18c16
9174 smbsrv/libsmbns: duplicate 'const' declaration specifier
commit 86e879b181a8be14fca192bfe0030bec1310e4ca
9146 libdtrace: this statement may fall through
commit d22bfd225d09e94269c9a8afaf1e686a5d74d823
9121 dladm: addrval can be NULL, need to check in iptun_process_addrarg()
commit 6e6c7d67bf5ba2efa13619acd59395d0f278ee75
8659 ata: unused but set warnings with GCC 5.X
commit b2be350e700b2900626f0977c47dddefdf617cfd
9216 awk: this statement may fall through
commit eea675a170a637d45397e62f4efc44be56b572a3
9226 fd: this statement may fall through
commit 66d7818b6a24876c96bdd1a81986c017f368decd
9228 zone_getattr(ZONE_ATTR_NETWORK) returns uninitialised value
9230 zone_getattr(ZONE_ATTR_NETWORK) doesn't check user-supplied buffer size
commit cf837ed8ca7273a1e7b940fb7b52eb12ae1d5ea6
9198 libstand: Const-ify buffer argument of write(2) analog
commit d0b12b660e0741581d18f1f3a7d5268e0a5f1806
9214 typo: sytem should be system
commit edc8ef7d921c96b23969898aeb766cb24960bda7
9213 zfs: sytem typo
commit 88e1588bca8b2374cfe26f7f5b377c59710c6a4b
9144 libsqlite: this statement may fall through
commit 5fb574e854f31be9e2869532e3b126fa424ee4d9
9179 gss_mechs/mech_krb5 this use of "defined" may not be portable
commit 99591362ae3dee1f30d3be8bc4bdca109e256eb7
9106 praudit could go faster
commit 60b5a7045427fa16a88b09bb21a4fdf5608cb3f0
9206 Move getsecs() prototype to stand.h from net.h so it can be used everywhere
commit 810d639eb61bde114845e4c7852b983d06536b8b
9231 nightly should create a log/latest/ symlink
commit 84c66da4cde7f54163e6f9a68f671d8351dd9eed
1956 /usr/bin/uname '-o' should return 'illumos'
Conflicts:
usr/src/lib/libshell/common/README (deleted)
usr/src/uts/intel/p123_pcbe/Makefile (deleted)
Diffstat (limited to 'usr/src/uts/intel/Makefile.intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index 2d8aed1846..32d8867883 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -23,7 +23,7 @@ # Copyright (c) 2013 Andrew Stormont. All rights reserved. # Copyright 2016 Joyent, Inc. # Copyright 2016 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Nexenta Systems, Inc. +# Copyright 2018 Nexenta Systems, Inc. # # @@ -711,7 +711,7 @@ GENUNIX_KMODS += genunix # # Performance Counter BackEnd modules (/usr/kernel/pcbe) # -PCBE_KMODS += p123_pcbe p4_pcbe opteron_pcbe core_pcbe +PCBE_KMODS += p4_pcbe opteron_pcbe core_pcbe # # MAC-Type Plugin Modules (/kernel/mac) |