changeset 21301:67907a6084fb

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>
author Toomas Soome <tsoome@me.com>
date Sat, 27 Apr 2019 21:02:14 +0300
parents d930c4f40c46
children c8446a312b8e
files usr/src/uts/i86pc/os/mp_startup.c usr/src/uts/i86pc/os/trap.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/i86pc/os/mp_startup.c	Sat Apr 27 21:07:56 2019 +0300
+++ b/usr/src/uts/i86pc/os/mp_startup.c	Sat Apr 27 21:02:14 2019 +0300
@@ -549,7 +549,7 @@
 		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
 
--- a/usr/src/uts/i86pc/os/trap.c	Sat Apr 27 21:07:56 2019 +0300
+++ b/usr/src/uts/i86pc/os/trap.c	Sat Apr 27 21:02:14 2019 +0300
@@ -2088,7 +2088,7 @@
 
 	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 @@
 				current =
 				    ttc->ttc_limit - sizeof (trap_trace_rec_t);
 
-			if (current == NULL)
+			if (current == (uintptr_t)NULL)
 				continue;
 
 			rec = (trap_trace_rec_t *)current;