diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/i86pc/os/memscrub.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/os/trap.c | 30 |
2 files changed, 18 insertions, 17 deletions
diff --git a/usr/src/uts/i86pc/os/memscrub.c b/usr/src/uts/i86pc/os/memscrub.c index e3236ad752..6dd21e302f 100644 --- a/usr/src/uts/i86pc/os/memscrub.c +++ b/usr/src/uts/i86pc/os/memscrub.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -456,7 +456,8 @@ memscrub_add_span(uint64_t start, uint64_t bytes) (start < ns && end > ne)) panic("memscrub found overlapping memory ranges " "(0x%p-0x%p) and (0x%p-0x%p)", - (void *)start, (void *)end, (void *)ns, (void *)ne); + (void *)(uintptr_t)start, (void *)(uintptr_t)end, + (void *)(uintptr_t)ns, (void *)(uintptr_t)ne); /* * New span can be appended to an existing one. diff --git a/usr/src/uts/i86pc/os/trap.c b/usr/src/uts/i86pc/os/trap.c index 034db8a12c..335b49c3d6 100644 --- a/usr/src/uts/i86pc/os/trap.c +++ b/usr/src/uts/i86pc/os/trap.c @@ -1701,21 +1701,21 @@ dump_tss(void) const char tss_fmt[] = "tss.%s:\t0x%p\n"; /* Format string */ struct tss *tss = CPU->cpu_tss; - printf(tss_fmt, "tss_link", (void *)tss->tss_link); - printf(tss_fmt, "tss_esp0", (void *)tss->tss_esp0); - printf(tss_fmt, "tss_ss0", (void *)tss->tss_ss0); - printf(tss_fmt, "tss_esp1", (void *)tss->tss_esp1); - printf(tss_fmt, "tss_ss1", (void *)tss->tss_ss1); - printf(tss_fmt, "tss_esp2", (void *)tss->tss_esp2); - printf(tss_fmt, "tss_ss2", (void *)tss->tss_ss2); - printf(tss_fmt, "tss_cr3", (void *)tss->tss_cr3); - printf(tss_fmt, "tss_eip", (void *)tss->tss_eip); - printf(tss_fmt, "tss_eflags", (void *)tss->tss_eflags); - printf(tss_fmt, "tss_eax", (void *)tss->tss_eax); - printf(tss_fmt, "tss_ebx", (void *)tss->tss_ebx); - printf(tss_fmt, "tss_ecx", (void *)tss->tss_ecx); - printf(tss_fmt, "tss_edx", (void *)tss->tss_edx); - printf(tss_fmt, "tss_esp", (void *)tss->tss_esp); + printf(tss_fmt, "tss_link", (void *)(uintptr_t)tss->tss_link); + printf(tss_fmt, "tss_esp0", (void *)(uintptr_t)tss->tss_esp0); + printf(tss_fmt, "tss_ss0", (void *)(uintptr_t)tss->tss_ss0); + printf(tss_fmt, "tss_esp1", (void *)(uintptr_t)tss->tss_esp1); + printf(tss_fmt, "tss_ss1", (void *)(uintptr_t)tss->tss_ss1); + printf(tss_fmt, "tss_esp2", (void *)(uintptr_t)tss->tss_esp2); + printf(tss_fmt, "tss_ss2", (void *)(uintptr_t)tss->tss_ss2); + printf(tss_fmt, "tss_cr3", (void *)(uintptr_t)tss->tss_cr3); + printf(tss_fmt, "tss_eip", (void *)(uintptr_t)tss->tss_eip); + printf(tss_fmt, "tss_eflags", (void *)(uintptr_t)tss->tss_eflags); + printf(tss_fmt, "tss_eax", (void *)(uintptr_t)tss->tss_eax); + printf(tss_fmt, "tss_ebx", (void *)(uintptr_t)tss->tss_ebx); + printf(tss_fmt, "tss_ecx", (void *)(uintptr_t)tss->tss_ecx); + printf(tss_fmt, "tss_edx", (void *)(uintptr_t)tss->tss_edx); + printf(tss_fmt, "tss_esp", (void *)(uintptr_t)tss->tss_esp); } #endif /* __amd64 */ |