diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-05-18 13:12:23 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-05-18 13:12:23 -0400 |
| commit | 645c3a589af77ee8ceefd661ef71763341ee52ad (patch) | |
| tree | f28ddf1de044c393e18a227aa5549fae235fb6fe /usr/src/uts/i86pc | |
| parent | baac7cebc69e995ea935f1318f395a564ef90eed (diff) | |
| parent | ca0df52a1ec24f9498f363369c65d0e408d579b1 (diff) | |
| download | illumos-joyent-release-20220519.tar.gz | |
[illumos-gate merge]release-20220519
commit ca0df52a1ec24f9498f363369c65d0e408d579b1
14689 blkdev GUID support
commit ecc39deb3ff51afe175edd847dcffb926c47a239
14695 format: input() feedback should be more verbose
commit 6328d71e9dd97ed4dfdf9425b5dc7b9deb6f579a
14454 sys/debug.h: CTASSERT should use _Static_assert
commit b602cbcd64fbbebf696bd7c8e03367bdfa19805d
14696 nvmeadm command dumps core when libumem.so is used
commit 9f7719e79a5c2ccdc9ee6a14147ba723fb8c0e36
14643 ::dtrace dcmd can truncate output
Diffstat (limited to 'usr/src/uts/i86pc')
| -rw-r--r-- | usr/src/uts/i86pc/vm/hat_i86.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/i86pc/vm/hat_i86.c b/usr/src/uts/i86pc/vm/hat_i86.c index e5676e5cff..cf7f97f972 100644 --- a/usr/src/uts/i86pc/vm/hat_i86.c +++ b/usr/src/uts/i86pc/vm/hat_i86.c @@ -1140,8 +1140,8 @@ hat_pcp_setup(struct cpu *cpu) */ hati_cpu_punchin(cpu, (uintptr_t)&kdi_idt, PROT_READ); - CTASSERT(((uintptr_t)&kpti_tramp_start % MMU_PAGESIZE) == 0); - CTASSERT(((uintptr_t)&kpti_tramp_end % MMU_PAGESIZE) == 0); + VERIFY0((uintptr_t)&kpti_tramp_start % MMU_PAGESIZE); + VERIFY0((uintptr_t)&kpti_tramp_end % MMU_PAGESIZE); for (va = (uintptr_t)&kpti_tramp_start; va < (uintptr_t)&kpti_tramp_end; va += MMU_PAGESIZE) { hati_cpu_punchin(cpu, va, PROT_READ | PROT_EXEC); @@ -1175,8 +1175,8 @@ hat_pcp_setup(struct cpu *cpu) } } - CTASSERT(((uintptr_t)&kdi_isr_start % MMU_PAGESIZE) == 0); - CTASSERT(((uintptr_t)&kdi_isr_end % MMU_PAGESIZE) == 0); + VERIFY0((uintptr_t)&kdi_isr_start % MMU_PAGESIZE); + VERIFY0((uintptr_t)&kdi_isr_end % MMU_PAGESIZE); for (va = (uintptr_t)&kdi_isr_start; va < (uintptr_t)&kdi_isr_end; va += MMU_PAGESIZE) { hati_cpu_punchin(cpu, va, PROT_READ | PROT_EXEC); |