diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-01-17 12:34:19 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-01-17 12:34:19 +0000 |
| commit | 2a808e6f3a1c5fa1720415a217da96fb64133053 (patch) | |
| tree | 35a6f9db837e3cfe87bb2917503d93ebc9555b1f /usr/src/uts/common/sys/pci.h | |
| parent | 85c7b8606e4a61f48f51d72efd00cb54a4afc46a (diff) | |
| parent | b10f758d69dd151326d3859af7e1d857ec9a6355 (diff) | |
| download | illumos-joyent-release-20180118.tar.gz | |
[illumos-gate merge]release-20180118
commit b10f758d69dd151326d3859af7e1d857ec9a6355
8963 default chunk size used by ipmi_fru_read() is too large for some SP's
commit 301fd1d6f25595cd8c6d6795f39c72d97aff8cd9
8959 Add notifications when a scrub is paused or resumed
commit 01a059ee0cdece49f47fd4d70086dd5bc7d0b0ff
8856 arc_cksum_is_equal() doesn't take into account ABD-logic
commit b1b183574d0cf2bf3accbbf7717d88bdc3bbfc33
8952 VMware Workstation NVMe model is of "Unknown class of pci/pnpbios device" value
commit be93bc991e25533dcbeb10e952fe0b9314390d90
8806 xattr_dir_inactive() releases used vnode with kernel panic
commit 28e9047603953b20acb54306be7c48152a1b03e6
8954 libtopo cannot handle any array type other than string_array.
Conflicts:
usr/src/lib/libipmi/common/ipmi_fru.c
Diffstat (limited to 'usr/src/uts/common/sys/pci.h')
| -rw-r--r-- | usr/src/uts/common/sys/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/src/uts/common/sys/pci.h b/usr/src/uts/common/sys/pci.h index de0cb3e808..364fd0f37e 100644 --- a/usr/src/uts/common/sys/pci.h +++ b/usr/src/uts/common/sys/pci.h @@ -235,6 +235,7 @@ extern "C" { #define PCI_MASS_ATA 0x5 /* ATA Controller */ #define PCI_MASS_SATA 0x6 /* Serial ATA */ #define PCI_MASS_SAS 0x7 /* Serial Attached SCSI (SAS) Cntrlr */ +#define PCI_MASS_NVME 0x8 /* Non-Volatile memory controller */ #define PCI_MASS_OTHER 0x80 /* Other Mass Storage Controller */ /* |