diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-09-21 11:50:45 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-09-21 11:50:45 +0000 |
| commit | 198b273b500c16488856bc36cabe112849dd6d3b (patch) | |
| tree | 9eafee5cbd2d0752ad93bae98ffc853da473521c | |
| parent | 2b4a3b61df2d434e6512ab10225e77b1ab2396fa (diff) | |
| parent | 047c81d31d0f571d6652e97143cd15281de61e84 (diff) | |
| download | illumos-joyent-198b273b500c16488856bc36cabe112849dd6d3b.tar.gz | |
[illumos-gate merge]
commit 047c81d31d0f571d6652e97143cd15281de61e84
1700 Add SCSI UNMAP support
Conflicts:
usr/src/uts/i86pc/os/cpuid.c
usr/src/uts/common/fs/zfs/zvol.c
| -rw-r--r-- | usr/src/uts/i86pc/os/cpuid.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/usr/src/uts/i86pc/os/cpuid.c b/usr/src/uts/i86pc/os/cpuid.c index 874f8f4cf1..ed560c538e 100644 --- a/usr/src/uts/i86pc/os/cpuid.c +++ b/usr/src/uts/i86pc/os/cpuid.c @@ -3286,7 +3286,6 @@ cpuid_pass4(cpu_t *cpu, uint_t *hwcap_out) hwcap_flags_2 |= AV_386_2_RDSEED; if (*ebx & CPUID_INTC_EBX_7_0_SHA) hwcap_flags_2 |= AV_386_2_SHA; - } /* Detect systems with a potential CPUID limit */ |