diff options
| author | Toomas Soome <tsoome@me.com> | 2019-04-27 21:02:14 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-05-15 23:16:55 +0300 |
| commit | 8f22c1dff63d6147c87d6bff65bcd3970ad4d368 (patch) | |
| tree | 4436c7e4cde841e6a01072b95f259f552e5bd578 | |
| parent | fb46ffcae2cbe5ba3f2fe0c3104beb0a222897fd (diff) | |
| download | illumos-joyent-8f22c1dff63d6147c87d6bff65bcd3970ad4d368.tar.gz | |
10879 i86pc/i86xpv: assignment makes integer from pointer without a cast
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/i86pc/os/mp_startup.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/os/trap.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/i86pc/os/mp_startup.c b/usr/src/uts/i86pc/os/mp_startup.c index fe6c134c8c..ccadb2c968 100644 --- a/usr/src/uts/i86pc/os/mp_startup.c +++ b/usr/src/uts/i86pc/os/mp_startup.c @@ -549,7 +549,7 @@ mp_cpu_unconfigure_common(struct cpu *cp, int error) trap_trace_ctl_t *ttc = &trap_trace_ctl[cp->cpu_id]; kmem_free((void *)ttc->ttc_first, trap_trace_bufsize); - ttc->ttc_first = NULL; + ttc->ttc_first = (uintptr_t)NULL; } #endif diff --git a/usr/src/uts/i86pc/os/trap.c b/usr/src/uts/i86pc/os/trap.c index ba3d7ac6e9..f30bedd3f2 100644 --- a/usr/src/uts/i86pc/os/trap.c +++ b/usr/src/uts/i86pc/os/trap.c @@ -2088,7 +2088,7 @@ dump_ttrace(void) for (i = 0; i < n; i++) { ttc = &trap_trace_ctl[i]; - if (ttc->ttc_first == NULL) + if (ttc->ttc_first == (uintptr_t)NULL) continue; current = ttc->ttc_next - sizeof (trap_trace_rec_t); @@ -2104,7 +2104,7 @@ dump_ttrace(void) current = ttc->ttc_limit - sizeof (trap_trace_rec_t); - if (current == NULL) + if (current == (uintptr_t)NULL) continue; rec = (trap_trace_rec_t *)current; |