diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-11-25 12:33:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-11-25 12:33:18 +0000 |
| commit | 70102ef7b7b71b21e8fae6172bf09af8d95c02f2 (patch) | |
| tree | dc2bcefd82969b2fffb222dca0391cac46ca66a3 /usr/src/uts/common/vm | |
| parent | def8eb24e347b55aeaeb27f7e650cafc9ad35a5f (diff) | |
| parent | aefa9c84b0a900bedba3a7ed885f0ea75f3fe1ea (diff) | |
| download | illumos-joyent-70102ef7b7b71b21e8fae6172bf09af8d95c02f2.tar.gz | |
[illumos-gate merge]
commit aefa9c84b0a900bedba3a7ed885f0ea75f3fe1ea
12015 vioif with MSI-X not working on Google Compute Engine
commit c00b0288a75782c75abd0b9959021fd2417c8a28
12014 virtio_init_complete() comment should describe interrupt type parameter
commit d1f3e3c647f14e2496e646bb7ef0df729cbbf72a
11798 apix: cast between incompatible function types
commit 027bcc9f64a0a5915089267b0dc54c9ee05782b0
11797 i86pc: cast between incompatible function types
Diffstat (limited to 'usr/src/uts/common/vm')
| -rw-r--r-- | usr/src/uts/common/vm/seg_kmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/vm/seg_kmem.c b/usr/src/uts/common/vm/seg_kmem.c index 0b116d6eba..15666a7da3 100644 --- a/usr/src/uts/common/vm/seg_kmem.c +++ b/usr/src/uts/common/vm/seg_kmem.c @@ -440,7 +440,7 @@ segkmem_badop() panic("segkmem_badop"); } -#define SEGKMEM_BADOP(t) (t(*)())segkmem_badop +#define SEGKMEM_BADOP(t) (t(*)())(uintptr_t)segkmem_badop /*ARGSUSED*/ static faultcode_t @@ -1224,7 +1224,7 @@ static void segkmem_free_one_lp(caddr_t addr, size_t size) { page_t *pp, *rootpp = NULL; - pgcnt_t pgs_left = btopr(size); + pgcnt_t pgs_left = btopr(size); ASSERT(size == segkmem_lpsize); @@ -1424,7 +1424,7 @@ segkmem_free_lpi(vmem_t *vmp, void *inaddr, size_t size) pgcnt_t nlpages = size >> segkmem_lpshift; size_t lpsize = segkmem_lpsize; caddr_t addr = inaddr; - pgcnt_t npages = btopr(size); + pgcnt_t npages = btopr(size); int i; ASSERT(vmp == heap_lp_arena); |