diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-12-20 12:54:05 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-12-20 12:54:05 +0000 |
| commit | d384a19cd8c976c255ac2b9dba55faafb89d3374 (patch) | |
| tree | 6911dbb701ec3f8a64d18d39239da093e2924cbe /usr/src/uts | |
| parent | 1b4b6f23c2256de6934b89b05c0a77a44b84f817 (diff) | |
| parent | d0972c645cf979856ed66c1c6a1f082383c90b0c (diff) | |
| download | illumos-joyent-d384a19cd8c976c255ac2b9dba55faafb89d3374.tar.gz | |
[illumos-gate merge]
commit d0972c645cf979856ed66c1c6a1f082383c90b0c
12093 devid_scsi_encode() should use a static format string
commit 028b5df8ad1713f1c0c8ba060ec660fe0a20261d
12095 Don't call sizeof on void
commit 2c4824dbe94f4768dd1a5058fc108fc83513cf59
11977 pchtemp(7D) missing Whiskey Lake PCI ID
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_scan.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/sys/range_tree.h | 12 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/pchtemp/pchtemp.c | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/driver_aliases | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c index 9d2b7a509c..81c7d599a4 100644 --- a/usr/src/uts/common/fs/zfs/dsl_scan.c +++ b/usr/src/uts/common/fs/zfs/dsl_scan.c @@ -1241,7 +1241,7 @@ dsl_scan_should_clear(dsl_scan_t *scn) if (queue != NULL) { /* # extents in exts_by_size = # in exts_by_addr */ mused += zfs_btree_numnodes(&queue->q_exts_by_size) * - sizeof (range_seg_t) + queue->q_sio_memused; + sizeof (range_seg_gap_t) + queue->q_sio_memused; } mutex_exit(&tvd->vdev_scan_io_queue_lock); } diff --git a/usr/src/uts/common/fs/zfs/sys/range_tree.h b/usr/src/uts/common/fs/zfs/sys/range_tree.h index d80faa933e..6e0025a2f1 100644 --- a/usr/src/uts/common/fs/zfs/sys/range_tree.h +++ b/usr/src/uts/common/fs/zfs/sys/range_tree.h @@ -126,11 +126,11 @@ rs_get_start_raw(const range_seg_t *rs, const range_tree_t *rt) ASSERT3U(rt->rt_type, <=, RANGE_SEG_NUM_TYPES); switch (rt->rt_type) { case RANGE_SEG32: - return (((range_seg32_t *)rs)->rs_start); + return (((const range_seg32_t *)rs)->rs_start); case RANGE_SEG64: - return (((range_seg64_t *)rs)->rs_start); + return (((const range_seg64_t *)rs)->rs_start); case RANGE_SEG_GAP: - return (((range_seg_gap_t *)rs)->rs_start); + return (((const range_seg_gap_t *)rs)->rs_start); default: VERIFY(0); return (0); @@ -143,11 +143,11 @@ rs_get_end_raw(const range_seg_t *rs, const range_tree_t *rt) ASSERT3U(rt->rt_type, <=, RANGE_SEG_NUM_TYPES); switch (rt->rt_type) { case RANGE_SEG32: - return (((range_seg32_t *)rs)->rs_end); + return (((const range_seg32_t *)rs)->rs_end); case RANGE_SEG64: - return (((range_seg64_t *)rs)->rs_end); + return (((const range_seg64_t *)rs)->rs_end); case RANGE_SEG_GAP: - return (((range_seg_gap_t *)rs)->rs_end); + return (((const range_seg_gap_t *)rs)->rs_end); default: VERIFY(0); return (0); diff --git a/usr/src/uts/intel/io/pchtemp/pchtemp.c b/usr/src/uts/intel/io/pchtemp/pchtemp.c index 2c2997c958..645de72727 100644 --- a/usr/src/uts/intel/io/pchtemp/pchtemp.c +++ b/usr/src/uts/intel/io/pchtemp/pchtemp.c @@ -39,6 +39,7 @@ * - Intel 100 Series PCH * - Intel 200 Series and Z730 PCH * - Intel Sunrise Point-LP (Kaby Lake-U) PCH + * - Intel Cannon Lake (Whiskey Lake-U) PCH * - Intel 300 Series and C240 Chipset * * The following chipsets use a different format and are not currently diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases index 230c4232e5..b1aec02501 100644 --- a/usr/src/uts/intel/os/driver_aliases +++ b/usr/src/uts/intel/os/driver_aliases @@ -1203,6 +1203,7 @@ pchtemp "pci8086,8ca4,p" pchtemp "pci8086,8c24,p" pchtemp "pci8086,8d24,p" pchtemp "pci8086,9d31,p" +pchtemp "pci8086,9df9,p" pchtemp "pci8086,a1b1,p" pchtemp "pci8086,a231,p" pchtemp "pci8086,a2b1,p" |