6698108 Sun Studio 12 finds many lint errors in ON source.
--- a/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/dhcp.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/dhcp.c Thu Jul 31 15:02:18 2008 -0700
@@ -165,7 +165,7 @@
default:
dhcpmsg(LOG_INFO,
"Unexpected DHCP message type: %d from client: %s.\n",
- plp->opts[CD_DHCP_TYPE]->value, pcd->cidbuf);
+ pcd->state, pcd->cidbuf);
break;
}
}
--- a/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/interfaces.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/interfaces.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -207,8 +207,8 @@
else {
if (debug) {
dhcpmsg(LOG_DEBUG,
- "%04d: Refreshed (0x%x) to (0x%x)\n",
- thr_self(), plp, retplp);
+ "%04d: Refreshed (0x%p) to (0x%p)\n",
+ thr_self(), (void *)plp, (void *)retplp);
}
free_plp(plp);
}
@@ -819,7 +819,7 @@
(void) mutex_unlock(&freep->thr_mtx);
pcd->clnt_thread = freep;
} else if (max_threads != -1 &&
- pnd->nthreads >= max_threads) {
+ pnd->nthreads >= max_threads) {
/*
* Add client once to deferred work
* list, to keep track of future work.
--- a/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/logging.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/logging.c Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
* CDDL HEADER END
*/
/*
- * Copyright (c) 1999-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -99,7 +98,7 @@
(void) octet_to_hexascii(plp->pkt->chaddr, plp->pkt->hlen, macbuf,
&maclen);
- dhcpmsg(log_local | LOG_NOTICE, "%s %s %010d %010d %s %s %s %s %s\n",
+ dhcpmsg(log_local | LOG_NOTICE, "%s %s %010ld %010ld %s %s %s %s %s\n",
proto, cat, time(NULL), lease,
inet_ntop(AF_INET, &cip, ntoabc, sizeof (ntoabc)),
inet_ntop(AF_INET, &sip, ntoabs, sizeof (ntoabs)),
--- a/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/main.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/main.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -467,7 +467,7 @@
THR_DAEMON | THR_BOUND | THR_DETACHED, &sigthread)) != 0) {
(void) fprintf(stderr,
gettext("Cannot start signal handling thread, error: %d\n"),
- err);
+ err);
return (err);
}
#ifdef DEBUG
@@ -568,7 +568,7 @@
if (verbose) {
if (i != 0)
dhcpmsg(LOG_ERR, "Error setting concurrency %d: %s\n",
- max_threads, strerror(i));
+ max_threads, strerror(i));
dhcpmsg(LOG_INFO, "Daemon Version: %s\n", DAEMON_VERS);
dhcpmsg(LOG_INFO, "Maximum relay hops: %d\n", max_hops);
if (log_local > -1) {
@@ -579,32 +579,32 @@
if (server_mode) {
dhcpmsg(LOG_INFO, "Run mode is: DHCP Server Mode.\n");
dhcpmsg(LOG_INFO, "Datastore resource: %s\n",
- datastore.d_resource ?
- datastore.d_resource : "");
+ datastore.d_resource ?
+ datastore.d_resource : "");
dhcpmsg(LOG_INFO, "Location: %s\n",
- datastore.d_location ?
- datastore.d_location : "");
- dhcpmsg(LOG_INFO, "DHCP offer TTL: %d\n", off_secs);
+ datastore.d_location ?
+ datastore.d_location : "");
+ dhcpmsg(LOG_INFO, "DHCP offer TTL: %ld\n", off_secs);
if (bootp_compat)
dhcpmsg(LOG_INFO,
"BOOTP compatibility enabled.\n");
if (rescan_interval != 0) {
dhcpmsg(LOG_INFO,
- "Dhcptab rescan interval: %d minutes.\n",
+ "Dhcptab rescan interval: %ld minutes.\n",
rescan_interval / rescan_scale);
}
- dhcpmsg(LOG_INFO, "ICMP validation timeout: %d "
+ dhcpmsg(LOG_INFO, "ICMP validation timeout: %ld "
"milliseconds, Attempts: %d.\n", icmp_timeout,
icmp_tries);
if (nsutimeout_secs != DHCP_NO_NSU) {
dhcpmsg(LOG_INFO, "Name service update "
- "enabled, timeout: %d seconds\n",
+ "enabled, timeout: %ld seconds\n",
nsutimeout_secs);
}
for (oip = owner_ip; oip->s_addr != INADDR_ANY; oip++)
dhcpmsg(LOG_INFO, "Owner IP address: %s\n",
- inet_ntop(AF_INET, oip, ntoab,
- sizeof (ntoab)));
+ inet_ntop(AF_INET, oip, ntoab,
+ sizeof (ntoab)));
dhcpmsg(LOG_INFO, "Maximum concurrent clients: %d\n",
max_clients);
dhcpmsg(LOG_INFO, "Maximum threads: %d\n", max_threads);
@@ -619,7 +619,7 @@
if (initntab() != 0) {
dhcpmsg(LOG_ERR, "Cannot allocate per network hash "
- "table.\n");
+ "table.\n");
local_closelog();
(void) mutex_destroy(&ttg_mtx);
(void) cond_destroy(&ttg_cv);
@@ -1320,8 +1320,8 @@
/* BOOTP packet */
if (!bootp_compat) {
dhcpmsg(LOG_INFO, "BOOTP request "
- "received on interface: %s "
- "ignored.\n", ifp->nm);
+ "received on interface: %s "
+ "ignored.\n", ifp->nm);
} else {
bootp(pcd, plp);
}
--- a/usr/src/lib/libc/i386/sys/ptrace.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/ptrace.c Thu Jul 31 15:02:18 2008 -0700
@@ -467,7 +467,7 @@
static void
MakeProcName(char *procname, pid_t pid)
{
- (void) sprintf(procname, "/proc/%d", pid);
+ (void) sprintf(procname, "/proc/%ld", pid);
}
/*
--- a/usr/src/lib/libuutil/common/uu_avl.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/lib/libuutil/common/uu_avl.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -120,7 +120,8 @@
UU_PTR_ENCODE(&pp->uap_null_avl)) {
uu_panic("uu_avl_pool_destroy: Pool \"%.*s\" (%p) has "
"outstanding avls, or is corrupt.\n",
- sizeof (pp->uap_name), pp->uap_name, pp);
+ (int)sizeof (pp->uap_name), pp->uap_name,
+ (void *)pp);
}
}
(void) pthread_mutex_lock(&uu_apool_list_lock);
@@ -142,14 +143,14 @@
if (offset + sizeof (*np) > pp->uap_objsize) {
uu_panic("uu_avl_node_init(%p, %p, %p (\"%s\")): "
"offset %ld doesn't fit in object (size %ld)\n",
- base, np, pp, pp->uap_name, offset,
- pp->uap_objsize);
+ base, (void *)np, (void *)pp, pp->uap_name,
+ (long)offset, (long)pp->uap_objsize);
}
if (offset != pp->uap_nodeoffset) {
uu_panic("uu_avl_node_init(%p, %p, %p (\"%s\")): "
"offset %ld doesn't match pool's offset (%ld)\n",
- base, np, pp, pp->uap_name, offset,
- pp->uap_objsize);
+ base, (void *)np, (void *)pp, pp->uap_name,
+ (long)offset, (long)pp->uap_objsize);
}
}
@@ -166,12 +167,12 @@
if (na[0] == DEAD_MARKER && na[1] == DEAD_MARKER) {
uu_panic("uu_avl_node_fini(%p, %p, %p (\"%s\")): "
"node already finied\n",
- base, np, pp, pp->uap_name);
+ base, (void *)np, (void *)pp, pp->uap_name);
}
if (na[0] != POOL_TO_MARKER(pp) || na[1] != 0) {
uu_panic("uu_avl_node_fini(%p, %p, %p (\"%s\")): "
"node corrupt, in tree, or in different pool\n",
- base, np, pp, pp->uap_name);
+ base, (void *)np, (void *)pp, pp->uap_name);
}
}
@@ -251,12 +252,13 @@
if (ap->ua_debug) {
if (avl_numnodes(&ap->ua_tree) != 0) {
- uu_panic("uu_avl_destroy(%p): tree not empty\n", ap);
+ uu_panic("uu_avl_destroy(%p): tree not empty\n",
+ (void *)ap);
}
if (ap->ua_null_walk.uaw_next != &ap->ua_null_walk ||
ap->ua_null_walk.uaw_prev != &ap->ua_null_walk) {
uu_panic("uu_avl_destroy(%p): outstanding walkers\n",
- ap);
+ (void *)ap);
}
}
(void) pthread_mutex_lock(&pp->uap_lock);
@@ -441,7 +443,7 @@
(void) _avl_walk_advance(wp, ap);
} else if (wp->uaw_next_result != NULL) {
uu_panic("uu_avl_remove(%p, %p): active non-robust "
- "walker\n", ap, elem);
+ "walker\n", (void *)ap, elem);
}
}
@@ -497,19 +499,19 @@
if (na[1] != 0)
uu_panic("uu_avl_insert(%p, %p, %p): node already "
"in tree, or corrupt\n",
- ap, elem, idx);
+ (void *)ap, elem, (void *)idx);
if (na[0] == 0)
uu_panic("uu_avl_insert(%p, %p, %p): node not "
"initialized\n",
- ap, elem, idx);
+ (void *)ap, elem, (void *)idx);
if (na[0] != POOL_TO_MARKER(pp))
uu_panic("uu_avl_insert(%p, %p, %p): node from "
"other pool, or corrupt\n",
- ap, elem, idx);
+ (void *)ap, elem, (void *)idx);
if (!INDEX_VALID(ap, idx))
uu_panic("uu_avl_insert(%p, %p, %p): %s\n",
- ap, elem, idx,
+ (void *)ap, elem, (void *)idx,
INDEX_CHECK(idx)? "outdated index" :
"invalid index");
@@ -526,8 +528,8 @@
{
if (ap->ua_debug && !INDEX_VALID(ap, idx))
uu_panic("uu_avl_nearest_next(%p, %p): %s\n",
- ap, idx, INDEX_CHECK(idx)? "outdated index" :
- "invalid index");
+ (void *)ap, (void *)idx, INDEX_CHECK(idx)?
+ "outdated index" : "invalid index");
return (avl_nearest(&ap->ua_tree, INDEX_DECODE(idx), AVL_AFTER));
}
@@ -536,8 +538,8 @@
{
if (ap->ua_debug && !INDEX_VALID(ap, idx))
uu_panic("uu_avl_nearest_prev(%p, %p): %s\n",
- ap, idx, INDEX_CHECK(idx)? "outdated index" :
- "invalid index");
+ (void *)ap, (void *)idx, INDEX_CHECK(idx)?
+ "outdated index" : "invalid index");
return (avl_nearest(&ap->ua_tree, INDEX_DECODE(idx), AVL_BEFORE));
}
--- a/usr/src/lib/libuutil/common/uu_list.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/lib/libuutil/common/uu_list.c Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -117,7 +116,8 @@
UU_PTR_ENCODE(&pp->ulp_null_list)) {
uu_panic("uu_list_pool_destroy: Pool \"%.*s\" (%p) has "
"outstanding lists, or is corrupt.\n",
- sizeof (pp->ulp_name), pp->ulp_name, pp);
+ (int)sizeof (pp->ulp_name), pp->ulp_name,
+ (void *)pp);
}
}
(void) pthread_mutex_lock(&uu_lpool_list_lock);
@@ -139,14 +139,14 @@
if (offset + sizeof (*np) > pp->ulp_objsize) {
uu_panic("uu_list_node_init(%p, %p, %p (\"%s\")): "
"offset %ld doesn't fit in object (size %ld)\n",
- base, np, pp, pp->ulp_name, offset,
- pp->ulp_objsize);
+ base, (void *)np, (void *)pp, pp->ulp_name,
+ (long)offset, (long)pp->ulp_objsize);
}
if (offset != pp->ulp_nodeoffset) {
uu_panic("uu_list_node_init(%p, %p, %p (\"%s\")): "
"offset %ld doesn't match pool's offset (%ld)\n",
- base, np, pp, pp->ulp_name, offset,
- pp->ulp_objsize);
+ base, (void *)np, (void *)pp, pp->ulp_name,
+ (long)offset, (long)pp->ulp_objsize);
}
}
np->uln_next = POOL_TO_MARKER(pp);
@@ -163,13 +163,13 @@
np->uln_prev == NULL) {
uu_panic("uu_list_node_fini(%p, %p, %p (\"%s\")): "
"node already finied\n",
- base, np_arg, pp, pp->ulp_name);
+ base, (void *)np_arg, (void *)pp, pp->ulp_name);
}
if (np->uln_next != POOL_TO_MARKER(pp) ||
np->uln_prev != NULL) {
uu_panic("uu_list_node_fini(%p, %p, %p (\"%s\")): "
"node corrupt or on list\n",
- base, np_arg, pp, pp->ulp_name);
+ base, (void *)np_arg, (void *)pp, pp->ulp_name);
}
}
np->uln_next = NULL;
@@ -190,7 +190,7 @@
if (pp->ulp_debug)
uu_panic("uu_list_create(%p, ...): requested "
"UU_LIST_SORTED, but pool has no comparison func\n",
- pp);
+ (void *)pp);
uu_set_error(UU_ERROR_NOT_SUPPORTED);
return (NULL);
}
@@ -236,16 +236,16 @@
if (lp->ul_null_node.uln_next != &lp->ul_null_node ||
lp->ul_null_node.uln_prev != &lp->ul_null_node) {
uu_panic("uu_list_destroy(%p): list not empty\n",
- lp);
+ (void *)lp);
}
if (lp->ul_numnodes != 0) {
uu_panic("uu_list_destroy(%p): numnodes is nonzero, "
- "but list is empty\n", lp);
+ "but list is empty\n", (void *)lp);
}
if (lp->ul_null_walk.ulw_next != &lp->ul_null_walk ||
lp->ul_null_walk.ulw_prev != &lp->ul_null_walk) {
uu_panic("uu_list_destroy(%p): outstanding walkers\n",
- lp);
+ (void *)lp);
}
}
@@ -266,13 +266,14 @@
if (lp->ul_debug) {
if (next->uln_prev != prev || prev->uln_next != next)
uu_panic("insert(%p): internal error: %p and %p not "
- "neighbors\n", lp, next, prev);
+ "neighbors\n", (void *)lp, (void *)next,
+ (void *)prev);
if (np->uln_next != POOL_TO_MARKER(lp->ul_pool) ||
np->uln_prev != NULL) {
uu_panic("insert(%p): elem %p node %p corrupt, "
"not initialized, or already in a list.\n",
- lp, NODE_TO_ELEM(lp, np), np);
+ (void *)lp, NODE_TO_ELEM(lp, np), (void *)np);
}
/*
* invalidate outstanding uu_list_index_ts.
@@ -299,12 +300,12 @@
if (lp->ul_debug) {
if (!INDEX_VALID(lp, idx))
uu_panic("uu_list_insert(%p, %p, %p): %s\n",
- lp, elem, idx,
+ (void *)lp, elem, (void *)idx,
INDEX_CHECK(idx)? "outdated index" :
"invalid index");
if (np->uln_prev == NULL)
uu_panic("uu_list_insert(%p, %p, %p): out-of-date "
- "index\n", lp, elem, idx);
+ "index\n", (void *)lp, elem, (void *)idx);
}
list_insert(lp, ELEM_TO_NODE(lp, elem), np->uln_prev, np);
@@ -354,11 +355,12 @@
if (lp->ul_debug) {
if (!INDEX_VALID(lp, idx))
uu_panic("uu_list_nearest_next(%p, %p): %s\n",
- lp, idx, INDEX_CHECK(idx)? "outdated index" :
+ (void *)lp, (void *)idx,
+ INDEX_CHECK(idx)? "outdated index" :
"invalid index");
if (np->uln_prev == NULL)
uu_panic("uu_list_nearest_next(%p, %p): out-of-date "
- "index\n", lp, idx);
+ "index\n", (void *)lp, (void *)idx);
}
if (np == &lp->ul_null_node)
@@ -378,11 +380,11 @@
if (lp->ul_debug) {
if (!INDEX_VALID(lp, idx))
uu_panic("uu_list_nearest_prev(%p, %p): %s\n",
- lp, idx, INDEX_CHECK(idx)? "outdated index" :
- "invalid index");
+ (void *)lp, (void *)idx, INDEX_CHECK(idx)?
+ "outdated index" : "invalid index");
if (np->uln_prev == NULL)
uu_panic("uu_list_nearest_prev(%p, %p): out-of-date "
- "index\n", lp, idx);
+ "index\n", (void *)lp, (void *)idx);
}
if ((np = np->uln_prev) == &lp->ul_null_node)
@@ -538,7 +540,7 @@
if (lp->ul_debug) {
if (np->uln_prev == NULL)
uu_panic("uu_list_remove(%p, %p): elem not on list\n",
- lp, elem);
+ (void *)lp, elem);
/*
* invalidate outstanding uu_list_index_ts.
*/
@@ -556,7 +558,7 @@
(void) list_walk_advance(wp, lp);
} else if (wp->ulw_next_result != NULL) {
uu_panic("uu_list_remove(%p, %p): active non-robust "
- "walker\n", lp, elem);
+ "walker\n", (void *)lp, elem);
}
}
@@ -578,8 +580,8 @@
* XXX: disable list modification until list is empty
*/
if (lp->ul_debug && *cookie != NULL)
- uu_panic("uu_list_teardown(%p, %p): unexpected cookie\n", lp,
- cookie);
+ uu_panic("uu_list_teardown(%p, %p): unexpected cookie\n",
+ (void *)lp, (void *)cookie);
ep = uu_list_first(lp);
if (ep)
@@ -599,12 +601,12 @@
if (np->uln_prev == NULL)
uu_panic("uu_list_insert_before(%p, %p, %p): %p is "
"not currently on a list\n",
- lp, target, elem, target);
+ (void *)lp, target, elem, target);
}
if (lp->ul_sorted) {
if (lp->ul_debug)
uu_panic("uu_list_insert_before(%p, ...): list is "
- "UU_LIST_SORTED\n", lp);
+ "UU_LIST_SORTED\n", (void *)lp);
uu_set_error(UU_ERROR_NOT_SUPPORTED);
return (-1);
}
@@ -625,12 +627,12 @@
if (np->uln_prev == NULL)
uu_panic("uu_list_insert_after(%p, %p, %p): %p is "
"not currently on a list\n",
- lp, target, elem, target);
+ (void *)lp, target, elem, target);
}
if (lp->ul_sorted) {
if (lp->ul_debug)
uu_panic("uu_list_insert_after(%p, ...): list is "
- "UU_LIST_SORTED\n", lp);
+ "UU_LIST_SORTED\n", (void *)lp);
uu_set_error(UU_ERROR_NOT_SUPPORTED);
return (-1);
}
--- a/usr/src/psm/promif/ieee1275/common/prom_test.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/psm/promif/ieee1275/common/prom_test.c Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -72,7 +71,7 @@
} else {
(void) prom_sprintf(buf,
"\" %s\" h# %x find-method invert h# %p l!",
- method, node, &rv);
+ method, node, (void *)&rv);
prom_interpret(buf, 0, 0, 0, 0, 0);
}
return (rv);
--- a/usr/src/psm/stand/cpr/sparcv9/sun4u/bitmap.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/psm/stand/cpr/sparcv9/sun4u/bitmap.c Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -231,10 +230,10 @@
str = "map_free_phys";
virt = prom_claim_virt(size, vaddr);
CB_VPRINTF(("\n%s: claim vaddr 0x%p, size 0x%lx, ret 0x%p\n",
- str, vaddr, size, virt));
+ str, (void *)vaddr, size, (void *)virt));
if (virt != vaddr) {
prom_printf("\n%s: cant reserve (0x%p - 0x%p) for \"%s\"\n",
- str, vaddr, vaddr + size, name);
+ str, (void *)vaddr, (void *)(vaddr + size), name);
return (virt);
}
@@ -248,7 +247,7 @@
err = prom_map_phys(-1, MMU_PAGESIZE, virt, phys);
if (err || verbose) {
prom_printf(" map virt 0x%p, phys 0x%llx, "
- "ppn 0x%x, ret %d\n", virt, phys, ppn, err);
+ "ppn 0x%x, ret %d\n", (void *)virt, phys, ppn, err);
}
if (err)
return ((caddr_t)ERR);
@@ -516,7 +515,7 @@
oldphys = PN_TO_ADDR(oldppn);
CB_VPRINTF((" remap vaddr 0x%p, old 0x%lx/0x%llx,"
" new 0x%lx/0x%llx\n",
- vaddr, oldppn, oldphys, newppn, newphys));
+ (void *)vaddr, oldppn, oldphys, newppn, newphys));
phys_xcopy(oldphys, newphys, MMU_PAGESIZE);
err = prom_remap(MMU_PAGESIZE, vaddr, newphys);
if (err)
--- a/usr/src/uts/common/brand/lx/os/lx_syscall.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/brand/lx/os/lx_syscall.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -447,7 +447,7 @@
break;
}
default:
- panic("Invalid syscall entry: #%d at 0x%p\n", num, jsp);
+ panic("Invalid syscall entry: #%d at 0x%p\n", num, (void *)jsp);
}
lx_print("----------> return (0x%llx)\n", (long long)rval);
return (rval);
--- a/usr/src/uts/common/cpr/cpr_dump.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/cpr/cpr_dump.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -927,7 +927,7 @@
i_cpr_mapin(CPR->c_mapping_area, npg, pfn);
CPR_DEBUG(CPR_DEBUG3, "mapped-in %ld pages, vaddr 0x%p, pfn 0x%lx\n",
- npg, CPR->c_mapping_area, pfn);
+ npg, (void *)CPR->c_mapping_area, pfn);
/*
* Fill cpr page descriptor.
@@ -953,7 +953,7 @@
if (error) {
CPR_DEBUG(CPR_DEBUG1,
- "cpr_compress_and_write: vp 0x%p va 0x%x ", vp, va);
+ "cpr_compress_and_write: vp 0x%p va 0x%x ", (void *)vp, va);
CPR_DEBUG(CPR_DEBUG1, "pfn 0x%lx blk %d err %d\n",
pfn, cpr_file_bn, error);
} else {
@@ -1005,7 +1005,7 @@
CPR_DEBUG(CPR_DEBUG3,
"cpr_write: frmp=%p wptr=%p cnt=%lx...",
- fromp, cpr_wptr, bytes);
+ (void *)fromp, (void *)cpr_wptr, bytes);
/*
* cross check, this should not happen!
*/
@@ -1142,7 +1142,7 @@
else
action = "none";
prom_printf("range (0x%p, 0x%p), %s bitmap, %s %ld\n",
- vaddr, vaddr + size, bname, action, count);
+ (void *)vaddr, (void *)(vaddr + size), bname, action, count);
}
--- a/usr/src/uts/common/cpr/cpr_misc.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/cpr/cpr_misc.c Thu Jul 31 15:02:18 2008 -0700
@@ -916,7 +916,7 @@
} while ((cp = cp->cpu_next) != cpu_list);
if (brought_up_boot && (cpr_debug & (CPR_DEBUG1 | CPR_DEBUG6)))
prom_printf("changed cpu %p to state %d\n",
- bootcpu, CPU_CPR_ONLINE);
+ (void *)bootcpu, CPU_CPR_ONLINE);
mutex_exit(&cpu_lock);
return (rc);
--- a/usr/src/uts/common/cpr/cpr_uthread.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/cpr/cpr_uthread.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -202,10 +202,10 @@
}
CPR_DEBUG(CPR_DEBUG2, "cant stop t=%p state=%x pfg=%x "
- "sched=%x\n", tp, tp->t_state, tp->t_proc_flag,
- tp->t_schedflag);
+ "sched=%x\n", (void *)tp, tp->t_state,
+ tp->t_proc_flag, tp->t_schedflag);
CPR_DEBUG(CPR_DEBUG2, "proc %p state=%x pid=%d\n",
- ttoproc(tp), ttoproc(tp)->p_stat,
+ (void *)ttoproc(tp), ttoproc(tp)->p_stat,
ttoproc(tp)->p_pidp->pid_id);
return (1);
}
--- a/usr/src/uts/common/fs/cachefs/cachefs_vnops.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/cachefs/cachefs_vnops.c Thu Jul 31 15:02:18 2008 -0700
@@ -1084,6 +1084,7 @@
int inc;
ASSERT(MUTEX_HELD(&cp->c_statelock));
+ /*LINTED*/
ASSERT(PAGESIZE <= MAXBSIZE);
error = 0;
@@ -7511,6 +7512,7 @@
u_offset_t popoff;
size_t popsize = 0;
+ /*LINTED*/
ASSERT(((DEF_POP_SIZE / PAGESIZE) + 1) <= 17);
if (fscp->fs_info.fi_popsize > DEF_POP_SIZE)
--- a/usr/src/uts/common/fs/nfs/nfs_log.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/nfs/nfs_log.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -269,7 +269,8 @@
* increment the reference count because the node is
* entered into the global list.
*/
- LOGGING_DPRINT((10, "exportfs: adding nlbp=%p to list\n", nlbp));
+ LOGGING_DPRINT((10, "exportfs: adding nlbp=%p to list\n",
+ (void *)nlbp));
nlbp->lb_next = nfslog_buffer_list;
nfslog_buffer_list = nlbp;
@@ -358,7 +359,7 @@
* list.
*/
LOGGING_DPRINT((10,
- "log_buffer_rele lbp=%p disconnecting\n", lbp));
+ "log_buffer_rele lbp=%p disconnecting\n", (void *)lbp));
/*
* Hold additional reference before dropping the lb_lock
*/
@@ -407,7 +408,7 @@
/*
* ref count zero; finish clean up.
*/
- LOGGING_DPRINT((10, "log_buffer_rele lbp=%p freeing\n", lbp));
+ LOGGING_DPRINT((10, "log_buffer_rele lbp=%p freeing\n", (void *)lbp));
log_file_rele(lbp->lb_logfile);
len = strlen(lbp->lb_path) + 1;
@@ -447,7 +448,7 @@
goto out;
}
LOGGING_DPRINT((3, "log_file_create: %s vp=%p v_count=%d\n",
- name, vp, vp->v_count));
+ name, (void *)vp, vp->v_count));
logfile = (struct log_file *)kmem_zalloc(sizeof (*logfile), KM_SLEEP);
logfile->lf_path = name;
@@ -544,7 +545,7 @@
if (--lfp->lf_refcnt > 0) {
LOGGING_DPRINT((10,
"log_file_rele lfp=%p decremented refcnt to %d\n",
- lfp, lfp->lf_refcnt));
+ (void *)lfp, lfp->lf_refcnt));
mutex_exit(&lfp->lf_lock);
return;
}
@@ -553,7 +554,8 @@
/*NOTREACHED*/
}
- LOGGING_DPRINT((10, "log_file_rele lfp=%p freeing node\n", lfp));
+ LOGGING_DPRINT((10, "log_file_rele lfp=%p freeing node\n",
+ (void *)lfp));
lfp->lf_flags &= ~(L_PRINTED | L_ERROR);
@@ -569,7 +571,7 @@
} else {
LOGGING_DPRINT((3,
"log_file_rele: %s has been closed vp=%p v_count=%d\n",
- lfp->lf_path, lfp->lf_vp, lfp->lf_vp->v_count));
+ lfp->lf_path, (void *)lfp->lf_vp, lfp->lf_vp->v_count));
#endif
}
VN_RELE(lfp->lf_vp);
@@ -634,7 +636,7 @@
LOGGING_DPRINT((3,
"nfslog_record_alloc(log_buffer=%p mem=%p size=%lu)\n",
- exi->exi_logbuffer, lrp->log_record, lrp->size));
+ (void *)exi->exi_logbuffer, (void *)lrp->log_record, lrp->size));
return (lrp->log_record);
}
--- a/usr/src/uts/common/fs/sockfs/socksctp.h Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/socksctp.h Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -149,14 +148,16 @@
ASSERT(MUTEX_HELD(&(ssa)->ssa_sonode->ss_so.so_lock)); \
ASSERT((ssa)->ssa_refcnt > 0); \
++(ssa)->ssa_refcnt; \
- dprint(3, ("ssa_refhold on %p %d (%s,%d)\n", (ssa), \
- (ssa)->ssa_refcnt, __FILE__, __LINE__)); \
+ dprint(3, ("ssa_refhold on %p %d (%s,%d)\n", \
+ (void *)(ssa), (ssa)->ssa_refcnt, \
+ __FILE__, __LINE__)); \
}
#define SSA_REFRELE(ss, ssa) \
{ \
- dprint(3, ("ssa_refrele on %p %d (%s, %d)\n", (ssa), \
+ dprint(3, ("ssa_refrele on %p %d (%s, %d)\n", \
+ (void *)(ssa), \
(ssa)->ssa_refcnt-1, __FILE__, __LINE__)); \
ASSERT((ssa)->ssa_refcnt > 0); \
if (--(ssa)->ssa_refcnt == 0) { \
--- a/usr/src/uts/common/fs/sockfs/socksctpsubr.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/socksctpsubr.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -181,7 +181,7 @@
ssa->ssa_txqueued = 0;
ssa->ssa_rxqueued = 0;
}
- dprint(2, ("sosctp_assoc_create %p %p\n", ss, ssa));
+ dprint(2, ("sosctp_assoc_create %p %p\n", (void *)ss, (void *)ssa));
return (ssa);
}
@@ -190,7 +190,8 @@
{
struct sonode *so = &ss->ss_so;
- dprint(2, ("sosctp_assoc_free %p %p (%d)\n", ss, ssa, ssa->ssa_id));
+ dprint(2, ("sosctp_assoc_free %p %p (%d)\n", (void *)ss, (void *)ssa,
+ ssa->ssa_id));
ASSERT(MUTEX_HELD(&so->so_lock));
if (ssa->ssa_conn != NULL) {
mutex_exit(&so->so_lock);
@@ -319,7 +320,7 @@
while ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) ==
SS_ISCONNECTING && so->so_error == 0) {
- dprint(3, ("waiting for SS_ISCONNECTED on %p\n", so));
+ dprint(3, ("waiting for SS_ISCONNECTED on %p\n", (void *)so));
if (fmode & (FNDELAY|FNONBLOCK))
return (EINPROGRESS);
@@ -331,7 +332,7 @@
*/
return (EINTR);
}
- dprint(3, ("awoken on %p\n", so));
+ dprint(3, ("awoken on %p\n", (void *)so));
}
if (so->so_error != 0) {
@@ -368,7 +369,7 @@
while ((ssa->ssa_state & (SS_ISCONNECTED|SS_ISCONNECTING)) ==
SS_ISCONNECTING && ssa->ssa_error == 0) {
- dprint(3, ("waiting for SS_ISCONNECTED on %p\n", so));
+ dprint(3, ("waiting for SS_ISCONNECTED on %p\n", (void *)so));
if (fmode & (FNDELAY|FNONBLOCK))
return (EINPROGRESS);
@@ -380,7 +381,7 @@
*/
return (EINTR);
}
- dprint(3, ("awoken on %p\n", so));
+ dprint(3, ("awoken on %p\n", (void *)so));
}
if (ssa->ssa_error != 0) {
error = ssa->ssa_error;
@@ -568,7 +569,7 @@
nss->ss_so.so_state |= (ss->ss_so.so_state & (SS_NDELAY|SS_NONBLOCK));
nss->ss_so.so_state |=
(ssa->ssa_state & (SS_ISCONNECTED|SS_ISCONNECTING|
- SS_ISDISCONNECTING|SS_CANTSENDMORE|SS_CANTRCVMORE|SS_ISBOUND));
+ SS_ISDISCONNECTING|SS_CANTSENDMORE|SS_CANTRCVMORE|SS_ISBOUND));
nss->ss_so.so_error = ssa->ssa_error;
nss->ss_txqueued = ssa->ssa_txqueued;
nss->ss_wroff = ssa->ssa_wroff;
--- a/usr/src/uts/common/fs/sockfs/socksctpvnops.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/socksctpvnops.c Thu Jul 31 15:02:18 2008 -0700
@@ -187,7 +187,8 @@
ASSERT(so->so_count > 0);
so->so_count--; /* one fewer open reference */
- dprint(2, ("socksctpv_close: %p so_count %d\n", so, so->so_count));
+ dprint(2, ("socksctpv_close: %p so_count %d\n", (void *)so,
+ so->so_count));
if (so->so_count == 0) {
/*
@@ -593,7 +594,7 @@
struct file *nfp;
struct vnode *nvp = NULL, *accessvp;
- dprint(2, ("sctppeeloff %p\n", ss));
+ dprint(2, ("sctppeeloff %p\n", (void *)ss));
if (so->so_type != SOCK_SEQPACKET) {
return (EOPNOTSUPP);
--- a/usr/src/uts/common/fs/sockfs/socksdpsubr.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/socksdpsubr.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -64,7 +64,7 @@
while ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) ==
SS_ISCONNECTING && so->so_error == 0) {
- dprint(3, ("waiting for SS_ISCONNECTED on %p\n", so));
+ dprint(3, ("waiting for SS_ISCONNECTED on %p\n", (void *)so));
if (fmode & (FNDELAY|FNONBLOCK))
return (EINPROGRESS);
@@ -77,7 +77,7 @@
error = EINTR;
break;
}
- dprint(3, ("awoken on %p\n", so));
+ dprint(3, ("awoken on %p\n", (void *)so));
}
if (so->so_error != 0) {
--- a/usr/src/uts/common/fs/sockfs/sockssl.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/sockssl.c Thu Jul 31 15:02:18 2008 -0700
@@ -65,7 +65,8 @@
kssl_cmd_t kssl_cmd;
mblk_t *out;
- dprintso(so, 1, ("strsock_kssl_input(%p, %p)\n", vp, mp));
+ dprintso(so, 1, ("strsock_kssl_input(%p, %p)\n",
+ (void *)vp, (void *)mp));
kssl_cmd = kssl_handle_mblk(kssl_ctx, &mp, &out);
@@ -103,7 +104,8 @@
kssl_ctx_t kssl_ctx = so->so_kssl_ctx;
mblk_t *recmp;
- dprintso(so, 1, ("strsock_kssl_output(%p, %p)\n", vp, mp));
+ dprintso(so, 1, ("strsock_kssl_output(%p, %p)\n",
+ (void *)vp, (void *)mp));
if ((recmp = kssl_build_record(kssl_ctx, mp)) == NULL) {
/* The caller will free the bogus message */
--- a/usr/src/uts/common/fs/sockfs/sockstr.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/sockstr.c Thu Jul 31 15:02:18 2008 -0700
@@ -174,7 +174,7 @@
mutex_enter(&so->so_lock);
if (error != 0) {
dprintso(so, 0, ("so_sock2stream(%p): "
- "_SIOCSOCKFALLBACK failed\n", so));
+ "_SIOCSOCKFALLBACK failed\n", (void *)so));
goto exit;
}
so->so_state &= ~SS_DIRECT;
@@ -283,7 +283,7 @@
}
dprintso(so, 0,
("so_sock2stream(%p): moving T_CONN_IND\n",
- so));
+ (void *)so));
/* Drop lock across put() */
mutex_exit(&so->so_lock);
@@ -403,7 +403,7 @@
mblk_t *mp;
int error;
- dprintso(so, 1, ("so_strinit(%p)\n", so));
+ dprintso(so, 1, ("so_strinit(%p)\n", (void *)so));
/* Preallocate an unbind_req message */
mp = soallocproto(sizeof (struct T_unbind_req), _ALLOC_SLEEP);
@@ -652,7 +652,7 @@
return (0);
}
- dprintso(so, 1, ("do_tinfo(%p)\n", so));
+ dprintso(so, 1, ("do_tinfo(%p)\n", (void *)so));
/* Send T_INFO_REQ */
tir.PRIM_type = T_INFO_REQ;
@@ -713,7 +713,7 @@
return (0);
}
- dprintso(so, 1, ("do_tcapability(%p)\n", so));
+ dprintso(so, 1, ("do_tcapability(%p)\n", (void *)so));
/* Send T_CAPABILITY_REQ */
tcr.PRIM_type = T_CAPABILITY_REQ;
@@ -975,7 +975,7 @@
int error;
dprintso(so, 1, ("sowaitprim(%p, %d, %d, %d, %p, %lu)\n",
- so, request_prim, ack_prim, min_size, mpp, wait));
+ (void *)so, request_prim, ack_prim, min_size, (void *)mpp, wait));
ASSERT(MUTEX_HELD(&so->so_lock));
@@ -983,7 +983,7 @@
if (error)
return (error);
- dprintso(so, 1, ("got msg %p\n", mp));
+ dprintso(so, 1, ("got msg %p\n", (void *)mp));
if (DB_TYPE(mp) != M_PCPROTO ||
MBLKL(mp) < sizeof (tpr->type)) {
freemsg(mp);
@@ -1292,7 +1292,8 @@
while ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) ==
SS_ISCONNECTING && so->so_error == 0) {
- dprintso(so, 1, ("waiting for SS_ISCONNECTED on %p\n", so));
+ dprintso(so, 1, ("waiting for SS_ISCONNECTED on %p\n",
+ (void *)so));
if (fmode & (FNDELAY|FNONBLOCK))
return (EINPROGRESS);
@@ -1306,7 +1307,7 @@
*/
return (EINTR);
}
- dprintso(so, 1, ("awoken on %p\n", so));
+ dprintso(so, 1, ("awoken on %p\n", (void *)so));
}
if (so->so_error != 0) {
@@ -1690,7 +1691,7 @@
so = VTOSO(vp);
- dprintso(so, 1, ("strsock_proto(%p, %p)\n", vp, mp));
+ dprintso(so, 1, ("strsock_proto(%p, %p)\n", (void *)vp, (void *)mp));
/* Set default return values */
*firstmsgsigs = *wakeups = *allmsgsigs = *pollwakeups = 0;
@@ -2046,7 +2047,7 @@
*/
dprintso(so, 1,
("T_EXDATA_IND(%p): counts %d/%d state %s\n",
- vp, so->so_oobsigcnt, so->so_oobcnt,
+ (void *)vp, so->so_oobsigcnt, so->so_oobcnt,
pr_state(so->so_state, so->so_mode)));
if (msgdsize(mp->b_cont) == 0) {
@@ -2142,14 +2143,14 @@
dprintso(so, 1,
("after outofline T_EXDATA_IND(%p): "
"counts %d/%d poll 0x%x sig 0x%x state %s\n",
- vp, so->so_oobsigcnt,
+ (void *)vp, so->so_oobsigcnt,
so->so_oobcnt, *pollwakeups, *allmsgsigs,
pr_state(so->so_state, so->so_mode)));
} else {
dprintso(so, 1,
("after inline T_EXDATA_IND(%p): "
"counts %d/%d poll 0x%x sig 0x%x state %s\n",
- vp, so->so_oobsigcnt,
+ (void *)vp, so->so_oobsigcnt,
so->so_oobcnt, *pollwakeups, *allmsgsigs,
pr_state(so->so_state, so->so_mode)));
}
@@ -2705,7 +2706,7 @@
so = VTOSO(vp);
dprintso(so, 1, ("strsock_misc(%p, %p, 0x%x)\n",
- vp, mp, DB_TYPE(mp)));
+ (void *)vp, (void *)mp, DB_TYPE(mp)));
/* Set default return values */
*wakeups = *allmsgsigs = *firstmsgsigs = *pollwakeups = 0;
@@ -2725,14 +2726,14 @@
mutex_enter(&so->so_lock);
dprintso(so, 1,
("SIGURG(%p): counts %d/%d state %s\n",
- vp, so->so_oobsigcnt,
+ (void *)vp, so->so_oobsigcnt,
so->so_oobcnt,
pr_state(so->so_state, so->so_mode)));
so_oob_sig(so, 1, allmsgsigs, pollwakeups);
dprintso(so, 1,
("after SIGURG(%p): counts %d/%d "
" poll 0x%x sig 0x%x state %s\n",
- vp, so->so_oobsigcnt,
+ (void *)vp, so->so_oobsigcnt,
so->so_oobcnt, *pollwakeups, *allmsgsigs,
pr_state(so->so_state, so->so_mode)));
mutex_exit(&so->so_lock);
--- a/usr/src/uts/common/fs/sockfs/socksubr.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/socksubr.c Thu Jul 31 15:02:18 2008 -0700
@@ -240,7 +240,7 @@
}
dprint(0, ("soconfig: %s => vp %p, dev 0x%lx\n",
- devpath, vp, vp->v_rdev));
+ devpath, (void *)vp, vp->v_rdev));
sp = kmem_alloc(sizeof (*sp), KM_SLEEP);
sp->sp_domain = domain;
@@ -333,17 +333,17 @@
error = sogetvp(devpath, &vp, UIO_USERSPACE);
if (error) {
dprint(0, ("solookup: vp %p failed with %d\n",
- devpath, error));
+ (void *)devpath, error));
*errorp = EPROTONOSUPPORT;
return (NULL);
}
dprint(0, ("solookup: %p => vp %p, dev 0x%lx\n",
- devpath, vp, vp->v_rdev));
+ (void *)devpath, (void *)vp, vp->v_rdev));
return (vp);
}
dprint(0, ("solookup(%d,%d,%d) vp %p devpath %s\n",
- domain, type, protocol, sp->sp_vnode, sp->sp_devpath));
+ domain, type, protocol, (void *)sp->sp_vnode, sp->sp_devpath));
vp = sp->sp_vnode;
VN_HOLD(vp);
@@ -922,7 +922,7 @@
struct sonode *so2;
int error;
- dprintso(so, 1, ("so_ux_lookup(%p) name <%s>\n", so, soun->sun_path));
+ dprintso(so, 1, ("so_ux_lookup(%p) name <%s>\n", (void *)so, soun->sun_path));
error = lookupname(soun->sun_path, UIO_SYSSPACE, FOLLOW, NULLVPP, &vp);
if (error) {
@@ -1011,7 +1011,8 @@
{
int family;
- dprintso(so, 1, ("so_addr_verify(%p, %p, %d)\n", so, name, namelen));
+ dprintso(so, 1, ("so_addr_verify(%p, %p, %d)\n",
+ (void *)so, (void *)name, namelen));
ASSERT(name != NULL);
@@ -1102,7 +1103,7 @@
socklen_t addrlen;
dprintso(so, 1, ("so_ux_addr_xlate(%p, %p, %d, %d)\n",
- so, name, namelen, checkaccess));
+ (void *)so, (void *)name, namelen, checkaccess));
ASSERT(name != NULL);
ASSERT(so->so_family == AF_UNIX);
@@ -1129,7 +1130,8 @@
so->so_ux_faddr.soua_magic = SOU_MAGIC_EXPLICIT;
addr = &so->so_ux_faddr;
addrlen = (socklen_t)sizeof (so->so_ux_faddr);
- dprintso(so, 1, ("ux_xlate UNIX: addrlen %d, vp %p\n", addrlen, vp));
+ dprintso(so, 1, ("ux_xlate UNIX: addrlen %d, vp %p\n",
+ addrlen, (void *)vp));
VN_RELE(vp);
*addrp = addr;
*addrlenp = (socklen_t)addrlen;
@@ -1156,7 +1158,7 @@
* assigning fdbuf->fd_fds[i] to fp.
*/
bcopy((char *)&fdbuf->fd_fds[i], (char *)&fp, sizeof (fp));
- dprint(1, ("fdbuf_free: [%d] = %p\n", i, fp));
+ dprint(1, ("fdbuf_free: [%d] = %p\n", i, (void *)fp));
(void) closef(fp);
}
if (fdbuf->fd_ebuf != NULL)
@@ -1230,7 +1232,7 @@
if (audit_active)
audit_fdrecv(fd, fp);
dprint(1, ("fdbuf_extract: [%d] = %d, %p refcnt %d\n",
- i, fd, fp, fp->f_count));
+ i, fd, (void *)fp, fp->f_count));
}
return (0);
@@ -1283,7 +1285,7 @@
return (EBADF);
}
dprint(1, ("fdbuf_create: [%d] = %d, %p refcnt %d\n",
- i, fds[i], fp, fp->f_count));
+ i, fds[i], (void *)fp, fp->f_count));
mutex_enter(&fp->f_tlock);
fp->f_count++;
mutex_exit(&fp->f_tlock);
@@ -1352,7 +1354,7 @@
frp->free_arg != NULL &&
bcmp(frp->free_arg, fdbuf, fdbuflen) == 0) {
dprint(1, ("fdbuf_verify: fdbuf %p len %d\n",
- fdbuf, fdbuflen));
+ (void *)fdbuf, fdbuflen));
return (1);
} else {
zcmn_err(getzoneid(), CE_WARN,
@@ -1756,7 +1758,7 @@
cmsg = CMSG_NEXT(cmsg);
}
dprint(1, ("so_opt2cmsg: buf %p len %d; cend %p; final cmsg %p\n",
- control, controllen, cend, cmsg));
+ control, controllen, (void *)cend, (void *)cmsg));
ASSERT(cmsg <= cend);
return (0);
}
@@ -1963,61 +1965,61 @@
buf[0] = 0;
if (state & SS_ISCONNECTED)
- strcat(buf, "ISCONNECTED ");
+ (void) strcat(buf, "ISCONNECTED ");
if (state & SS_ISCONNECTING)
- strcat(buf, "ISCONNECTING ");
+ (void) strcat(buf, "ISCONNECTING ");
if (state & SS_ISDISCONNECTING)
- strcat(buf, "ISDISCONNECTING ");
+ (void) strcat(buf, "ISDISCONNECTING ");
if (state & SS_CANTSENDMORE)
- strcat(buf, "CANTSENDMORE ");
+ (void) strcat(buf, "CANTSENDMORE ");
if (state & SS_CANTRCVMORE)
- strcat(buf, "CANTRCVMORE ");
+ (void) strcat(buf, "CANTRCVMORE ");
if (state & SS_ISBOUND)
- strcat(buf, "ISBOUND ");
+ (void) strcat(buf, "ISBOUND ");
if (state & SS_NDELAY)
- strcat(buf, "NDELAY ");
+ (void) strcat(buf, "NDELAY ");
if (state & SS_NONBLOCK)
- strcat(buf, "NONBLOCK ");
+ (void) strcat(buf, "NONBLOCK ");
if (state & SS_ASYNC)
- strcat(buf, "ASYNC ");
+ (void) strcat(buf, "ASYNC ");
if (state & SS_ACCEPTCONN)
- strcat(buf, "ACCEPTCONN ");
+ (void) strcat(buf, "ACCEPTCONN ");
if (state & SS_HASCONNIND)
- strcat(buf, "HASCONNIND ");
+ (void) strcat(buf, "HASCONNIND ");
if (state & SS_SAVEDEOR)
- strcat(buf, "SAVEDEOR ");
+ (void) strcat(buf, "SAVEDEOR ");
if (state & SS_RCVATMARK)
- strcat(buf, "RCVATMARK ");
+ (void) strcat(buf, "RCVATMARK ");
if (state & SS_OOBPEND)
- strcat(buf, "OOBPEND ");
+ (void) strcat(buf, "OOBPEND ");
if (state & SS_HAVEOOBDATA)
- strcat(buf, "HAVEOOBDATA ");
+ (void) strcat(buf, "HAVEOOBDATA ");
if (state & SS_HADOOBDATA)
- strcat(buf, "HADOOBDATA ");
+ (void) strcat(buf, "HADOOBDATA ");
if (state & SS_FADDR_NOXLATE)
- strcat(buf, "FADDR_NOXLATE ");
+ (void) strcat(buf, "FADDR_NOXLATE ");
if (mode & SM_PRIV)
- strcat(buf, "PRIV ");
+ (void) strcat(buf, "PRIV ");
if (mode & SM_ATOMIC)
- strcat(buf, "ATOMIC ");
+ (void) strcat(buf, "ATOMIC ");
if (mode & SM_ADDR)
- strcat(buf, "ADDR ");
+ (void) strcat(buf, "ADDR ");
if (mode & SM_CONNREQUIRED)
- strcat(buf, "CONNREQUIRED ");
+ (void) strcat(buf, "CONNREQUIRED ");
if (mode & SM_FDPASSING)
- strcat(buf, "FDPASSING ");
+ (void) strcat(buf, "FDPASSING ");
if (mode & SM_EXDATA)
- strcat(buf, "EXDATA ");
+ (void) strcat(buf, "EXDATA ");
if (mode & SM_OPTDATA)
- strcat(buf, "OPTDATA ");
+ (void) strcat(buf, "OPTDATA ");
if (mode & SM_BYTESTREAM)
- strcat(buf, "BYTESTREAM ");
+ (void) strcat(buf, "BYTESTREAM ");
return (buf);
}
@@ -2027,7 +2029,7 @@
static char buf[1024];
if (addr == NULL || addrlen == 0) {
- sprintf(buf, "(len %d) %p", addrlen, addr);
+ (void) sprintf(buf, "(len %d) %p", addrlen, (void *)addr);
return (buf);
}
switch (family) {
@@ -2045,7 +2047,7 @@
uint16_t *piece = (uint16_t *)&sin6.sin6_addr;
bcopy((char *)addr, (char *)&sin6, sizeof (sin6));
- sprintf(buf, "(len %d) %x:%x:%x:%x:%x:%x:%x:%x/%d",
+ (void) sprintf(buf, "(len %d) %x:%x:%x:%x:%x:%x:%x:%x/%d",
addrlen,
ntohs(piece[0]), ntohs(piece[1]),
ntohs(piece[2]), ntohs(piece[3]),
@@ -2098,7 +2100,7 @@
break;
default:
printf("Bad oob state 1 (%p): counts %d/%d state %s\n",
- so, so->so_oobsigcnt,
+ (void *)so, so->so_oobsigcnt,
so->so_oobcnt, pr_state(so->so_state, so->so_mode));
return (0);
}
@@ -2106,7 +2108,7 @@
/* SS_RCVATMARK should only be set when SS_OOBPEND is set */
if ((so->so_state & (SS_RCVATMARK|SS_OOBPEND)) == SS_RCVATMARK) {
printf("Bad oob state 2 (%p): counts %d/%d state %s\n",
- so, so->so_oobsigcnt,
+ (void *)so, so->so_oobsigcnt,
so->so_oobcnt, pr_state(so->so_state, so->so_mode));
return (0);
}
@@ -2117,7 +2119,7 @@
if (!EQUIV((so->so_oobsigcnt != 0) || (so->so_state & SS_RCVATMARK),
so->so_state & SS_OOBPEND)) {
printf("Bad oob state 3 (%p): counts %d/%d state %s\n",
- so, so->so_oobsigcnt,
+ (void *)so, so->so_oobsigcnt,
so->so_oobcnt, pr_state(so->so_state, so->so_mode));
return (0);
}
@@ -2128,13 +2130,13 @@
if (!(so->so_options & SO_OOBINLINE) &&
!EQUIV(so->so_oobmsg != NULL, so->so_state & SS_HAVEOOBDATA)) {
printf("Bad oob state 4 (%p): counts %d/%d state %s\n",
- so, so->so_oobsigcnt,
+ (void *)so, so->so_oobsigcnt,
so->so_oobcnt, pr_state(so->so_state, so->so_mode));
return (0);
}
if (so->so_oobsigcnt < so->so_oobcnt) {
printf("Bad oob state 5 (%p): counts %d/%d state %s\n",
- so, so->so_oobsigcnt,
+ (void *)so, so->so_oobsigcnt,
so->so_oobcnt, pr_state(so->so_state, so->so_mode));
return (0);
}
--- a/usr/src/uts/common/fs/sockfs/socksyscalls.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/socksyscalls.c Thu Jul 31 15:02:18 2008 -0700
@@ -105,7 +105,7 @@
int sdomain = domain;
dprint(1, ("so_socket(%d,%d,%d,%p,%d)\n",
- domain, type, protocol, devpath, version));
+ domain, type, protocol, (void *)devpath, version));
if (domain == AF_NCA) {
/*
@@ -405,7 +405,7 @@
struct sockaddr_ux *name;
size_t namelen;
- dprint(1, ("so_socketpair(%p)\n", sv));
+ dprint(1, ("so_socketpair(%p)\n", (void *)sv));
error = useracc(sv, sizeof (svs), B_WRITE);
if (error && do_useracc)
@@ -581,7 +581,7 @@
int error;
dprint(1, ("bind(%d, %p, %d)\n",
- sock, name, namelen));
+ sock, (void *)name, namelen));
if ((so = getsonode(sock, &error, NULL)) == NULL)
return (set_errno(error));
@@ -659,7 +659,7 @@
int nfd;
dprint(1, ("accept(%d, %p, %p)\n",
- sock, name, namelenp));
+ sock, (void *)name, (void *)namelenp));
if ((so = getsonode(sock, &error, &fp)) == NULL)
return (set_errno(error));
@@ -776,7 +776,7 @@
int error;
dprint(1, ("connect(%d, %p, %d)\n",
- sock, name, namelen));
+ sock, (void *)name, namelen));
if ((so = getsonode(sock, &error, &fp)) == NULL)
return (set_errno(error));
@@ -984,7 +984,7 @@
struct iovec aiov[1];
dprint(1, ("recvfrom(%d, %p, %ld, %d, %p, %p)\n",
- sock, buffer, len, flags, name, namelenp));
+ sock, buffer, len, flags, (void *)name, (void *)namelenp));
if ((ssize_t)len < 0) {
return (set_errno(EINVAL));
@@ -1032,7 +1032,7 @@
model_t model;
dprint(1, ("recvmsg(%d, %p, %d)\n",
- sock, msg, flags));
+ sock, (void *)msg, flags));
model = get_udatamodel();
STRUCT_INIT(u_lmsg, model);
@@ -1272,7 +1272,7 @@
int i;
model_t model;
- dprint(1, ("sendmsg(%d, %p, %d)\n", sock, msg, flags));
+ dprint(1, ("sendmsg(%d, %p, %d)\n", sock, (void *)msg, flags));
model = get_udatamodel();
STRUCT_INIT(u_lmsg, model);
@@ -1380,7 +1380,7 @@
struct iovec aiov[1];
dprint(1, ("sendto(%d, %p, %ld, %d, %p, %d)\n",
- sock, buffer, len, flags, name, namelen));
+ sock, buffer, len, flags, (void *)name, namelen));
if ((ssize_t)len < 0) {
return (set_errno(EINVAL));
@@ -1423,7 +1423,7 @@
socklen_t addrlen, size;
dprint(1, ("getpeername(%d, %p, %p)\n",
- sock, name, namelenp));
+ sock, (void *)name, (void *)namelenp));
if ((so = getsonode(sock, &error, NULL)) == NULL)
goto bad;
@@ -1493,7 +1493,7 @@
socklen_t addrlen, size;
dprint(1, ("getsockname(%d, %p, %p)\n",
- sock, name, namelenp));
+ sock, (void *)name, (void *)namelenp));
if ((so = getsonode(sock, &error, NULL)) == NULL)
goto bad;
@@ -1558,7 +1558,7 @@
int error;
dprint(1, ("getsockopt(%d, %d, %d, %p, %p)\n",
- sock, level, option_name, option_value, option_lenp));
+ sock, level, option_name, option_value, (void *)option_lenp));
if ((so = getsonode(sock, &error, NULL)) == NULL)
return (set_errno(error));
@@ -1659,7 +1659,7 @@
int error = 0;
dprint(1, ("sockconfig(%d, %d, %d, %p)\n",
- domain, type, protocol, devpath));
+ domain, type, protocol, (void *)devpath));
if (secpolicy_net_config(CRED(), B_FALSE) != 0)
return (set_errno(EPERM));
--- a/usr/src/uts/common/fs/sockfs/socktpi.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/socktpi.c Thu Jul 31 15:02:18 2008 -0700
@@ -374,7 +374,7 @@
void *nl7c = NULL;
dprintso(so, 1, ("sotpi_bindlisten(%p, %p, %d, %d, 0x%x) %s\n",
- so, name, namelen, backlog, flags,
+ (void *)so, (void *)name, namelen, backlog, flags,
pr_state(so->so_state, so->so_mode)));
tcp_udp_xport = so->so_type == SOCK_STREAM || so->so_type == SOCK_DGRAM;
@@ -413,8 +413,8 @@
dprintso(so, 1, ("sobind rebind UNIX: addrlen %d, "
"addr 0x%p, vp %p\n",
addrlen,
- ((struct so_ux_addr *)addr)->soua_vp,
- so->so_ux_bound_vp));
+ (void *)((struct so_ux_addr *)addr)->soua_vp,
+ (void *)so->so_ux_bound_vp));
} else {
addr = so->so_laddr_sa;
addrlen = (t_uscalar_t)so->so_laddr_len;
@@ -1033,7 +1033,7 @@
eprintso(so,
("addrlen %d, addr 0x%x, vp %p\n",
addrlen, *((int *)addr),
- so->so_ux_bound_vp));
+ (void *)so->so_ux_bound_vp));
goto done;
}
so->so_state |= SS_LADDR_VALID;
@@ -1159,7 +1159,7 @@
mblk_t *mp;
dprintso(so, 1, ("sotpi_unbind(%p, 0x%x) %s\n",
- so, flags, pr_state(so->so_state, so->so_mode)));
+ (void *)so, flags, pr_state(so->so_state, so->so_mode)));
ASSERT(MUTEX_HELD(&so->so_lock));
ASSERT(so->so_flag & SOLOCKED);
@@ -1247,7 +1247,7 @@
int error = 0;
dprintso(so, 1, ("sotpi_listen(%p, %d) %s\n",
- so, backlog, pr_state(so->so_state, so->so_mode)));
+ (void *)so, backlog, pr_state(so->so_state, so->so_mode)));
if (so->so_serv_type == T_CLTS)
return (EOPNOTSUPP);
@@ -1352,7 +1352,7 @@
mblk_t *mp;
dprintso(so, 1, ("sodisconnect(%p, %d, 0x%x) %s\n",
- so, seqno, flags, pr_state(so->so_state, so->so_mode)));
+ (void *)so, seqno, flags, pr_state(so->so_state, so->so_mode)));
if (!(flags & _SODISCONNECT_LOCK_HELD)) {
mutex_enter(&so->so_lock);
@@ -1433,7 +1433,8 @@
size_t sinlen;
dprintso(so, 1, ("sotpi_accept(%p, 0x%x, %p) %s\n",
- so, fflag, nsop, pr_state(so->so_state, so->so_mode)));
+ (void *)so, fflag, (void *)nsop,
+ pr_state(so->so_state, so->so_mode)));
/*
* Defer single-threading the accepting socket until
@@ -1951,7 +1952,7 @@
boolean_t need_unlock;
dprintso(so, 1, ("sotpi_connect(%p, %p, %d, 0x%x, 0x%x) %s\n",
- so, name, namelen, fflag, flags,
+ (void *)so, (void *)name, namelen, fflag, flags,
pr_state(so->so_state, so->so_mode)));
/*
@@ -2379,7 +2380,7 @@
int error = 0;
dprintso(so, 1, ("sotpi_shutdown(%p, %d) %s\n",
- so, how, pr_state(so->so_state, so->so_mode)));
+ (void *)so, how, pr_state(so->so_state, so->so_mode)));
mutex_enter(&so->so_lock);
so_lock_single(so); /* Set SOLOCKED */
@@ -2578,7 +2579,7 @@
return;
dprintso(so, 1, ("so_unix_close(%p) %s\n",
- so, pr_state(so->so_state, so->so_mode)));
+ (void *)so, pr_state(so->so_state, so->so_mode)));
toh.level = SOL_SOCKET;
toh.name = SO_UNIX_CLOSE;
@@ -2711,7 +2712,8 @@
mblk_t *mp, *nmp;
int error;
- dprintso(so, 1, ("sorecvoob(%p, %p, 0x%x)\n", so, msg, flags));
+ dprintso(so, 1, ("sorecvoob(%p, %p, 0x%x)\n",
+ (void *)so, (void *)msg, flags));
/*
* There is never any oob data with addresses or control since
@@ -2766,7 +2768,7 @@
}
dprintso(so, 1,
("after recvoob(%p): counts %d/%d state %s\n",
- so, so->so_oobsigcnt,
+ (void *)so, so->so_oobsigcnt,
so->so_oobcnt, pr_state(so->so_state, so->so_mode)));
ASSERT(so_verify_oobstate(so));
mutex_exit(&so->so_lock);
@@ -2926,7 +2928,7 @@
msg->msg_flags = 0;
dprintso(so, 1, ("sotpi_recvmsg(%p, %p, 0x%x) state %s err %d\n",
- so, msg, flags,
+ (void *)so, (void *)msg, flags,
pr_state(so->so_state, so->so_mode), so->so_error));
/*
@@ -4046,7 +4048,7 @@
dprintso(so, 1,
("sosend_svc: %p, resid %ld bytes, prim %d, sflag 0x%x\n",
- so, uiop->uio_resid, prim, sflag));
+ (void *)so, uiop->uio_resid, prim, sflag));
/*
* Has to be bound and connected. However, since no locks are
@@ -4140,7 +4142,7 @@
int flags;
dprintso(so, 1, ("sotpi_sendmsg(%p, %p, 0x%x) state %s, error %d\n",
- so, msg, msg->msg_flags,
+ (void *)so, (void *)msg, msg->msg_flags,
pr_state(so->so_state, so->so_mode), so->so_error));
mutex_enter(&so->so_lock);
@@ -4636,7 +4638,7 @@
k_sigset_t smask;
dprintso(so, 1, ("sotpi_getpeername(%p) %s\n",
- so, pr_state(so->so_state, so->so_mode)));
+ (void *)so, pr_state(so->so_state, so->so_mode)));
mutex_enter(&so->so_lock);
so_lock_single(so); /* Set SOLOCKED */
@@ -4746,7 +4748,7 @@
k_sigset_t smask;
dprintso(so, 1, ("sotpi_getsockname(%p) %s\n",
- so, pr_state(so->so_state, so->so_mode)));
+ (void *)so, pr_state(so->so_state, so->so_mode)));
mutex_enter(&so->so_lock);
so_lock_single(so); /* Set SOLOCKED */
@@ -4868,7 +4870,7 @@
uint32_t value;
dprintso(so, 1, ("sotpi_getsockopt(%p, 0x%x, 0x%x, %p, %p) %s\n",
- so, level, option_name, optval, optlenp,
+ (void *)so, level, option_name, optval, (void *)optlenp,
pr_state(so->so_state, so->so_mode)));
mutex_enter(&so->so_lock);
@@ -5163,7 +5165,7 @@
boolean_t handled = B_FALSE;
dprintso(so, 1, ("sotpi_setsockopt(%p, 0x%x, 0x%x, %p, %d) %s\n",
- so, level, option_name, optval, optlen,
+ (void *)so, level, option_name, optval, optlen,
pr_state(so->so_state, so->so_mode)));
--- a/usr/src/uts/common/fs/sockfs/sockvnops.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/sockfs/sockvnops.c Thu Jul 31 15:02:18 2008 -0700
@@ -317,7 +317,7 @@
so = VTOSO(vp);
dprintso(so, 1, ("socktpi_close(%p, %x, %d) %s\n",
- vp, flag, count, pr_state(so->so_state, so->so_mode)));
+ (void *)vp, flag, count, pr_state(so->so_state, so->so_mode)));
cleanlocks(vp, ttoproc(curthread)->p_pid, 0);
cleanshares(vp, ttoproc(curthread)->p_pid);
@@ -419,7 +419,7 @@
struct nmsghdr lmsg;
dprintso(so, 1, ("socktpi_read(%p) %s\n",
- so, pr_state(so->so_state, so->so_mode)));
+ (void *)so, pr_state(so->so_state, so->so_mode)));
ASSERT(vp->v_type == VSOCK);
so_update_attrs(so, SOACC);
@@ -451,7 +451,7 @@
int error;
dprintso(so, 1, ("socktpi_write(%p) %s\n",
- so, pr_state(so->so_state, so->so_mode)));
+ (void *)so, pr_state(so->so_state, so->so_mode)));
ASSERT(vp->v_type == VSOCK);
@@ -1235,7 +1235,7 @@
int so_state = so->so_state; /* snapshot */
dprintso(so, 0, ("socktpi_poll(%p): state %s err %d\n",
- vp, pr_state(so_state, so->so_mode), so->so_error));
+ (void *)vp, pr_state(so_state, so->so_mode), so->so_error));
ASSERT(vp->v_type == VSOCK);
ASSERT(vp->v_stream != NULL);
@@ -1364,7 +1364,7 @@
so = VTOSO(vp);
dprintso(so, 1, ("sock_getmsg(%p) %s\n",
- so, pr_state(so->so_state, so->so_mode)));
+ (void *)so, pr_state(so->so_state, so->so_mode)));
if (so->so_version == SOV_STREAM) {
/* The imaginary "sockmod" has been popped - act as a stream */
@@ -1409,7 +1409,7 @@
so = VTOSO(vp);
dprintso(so, 1, ("sock_putmsg(%p) %s\n",
- so, pr_state(so->so_state, so->so_mode)));
+ (void *)so, pr_state(so->so_state, so->so_mode)));
if (so->so_version == SOV_STREAM) {
/* The imaginary "sockmod" has been popped - act as a stream */
--- a/usr/src/uts/common/fs/zfs/dnode_sync.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/zfs/dnode_sync.c Thu Jul 31 15:02:18 2008 -0700
@@ -178,7 +178,7 @@
if (buf[j] != 0) {
panic("freed data not zero: "
"child=%p i=%d off=%d num=%d\n",
- child, i, off, num);
+ (void *)child, i, off, num);
}
}
}
@@ -195,7 +195,7 @@
if (buf[j] != 0) {
panic("freed data not zero: "
"child=%p i=%d off=%d num=%d\n",
- child, i, off, num);
+ (void *)child, i, off, num);
}
}
}
--- a/usr/src/uts/common/fs/zfs/zfs_znode.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/fs/zfs/zfs_znode.c Thu Jul 31 15:02:18 2008 -0700
@@ -588,7 +588,7 @@
* concurrent zgets on this object.
*/
if (nzp != NULL)
- panic("existing znode %p for dbuf %p", nzp, db);
+ panic("existing znode %p for dbuf %p", (void *)nzp, (void *)db);
/*
* Slap on VROOT if we are the root znode
--- a/usr/src/uts/common/inet/ip/ip_mroute.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/inet/ip/ip_mroute.c Thu Jul 31 15:02:18 2008 -0700
@@ -23,7 +23,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc.
+ * Copyright 2008 Sun Microsystems, Inc.
* All rights reserved. Use is subject to license terms.
*/
/* Copyright (c) 1990 Mentat Inc. */
@@ -2738,7 +2738,7 @@
mrouter->conn_rq,
1, SL_TRACE,
"reset_mrt_ill: "
- "ill 0x%p", ill);
+ "ill 0x%p", (void *)ill);
}
rt->mfc_rte = rte->rte_next;
freemsg(rte->mp);
@@ -3079,7 +3079,7 @@
(void) mi_strlog(mrouter->conn_rq, 1,
SL_TRACE,
"tbf_send_pkt: mp_loop 0x%p, ire 0x%p "
- "vif %ld\n", mp_loop, ire,
+ "vif %ld\n", (void *)mp_loop, (void *)ire,
(ptrdiff_t)(vifp - ipst->ips_vifs));
}
if (ire != NULL)
--- a/usr/src/uts/common/io/cardbus/cardbus.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/io/cardbus/cardbus.c Thu Jul 31 15:02:18 2008 -0700
@@ -162,7 +162,7 @@
extern struct mod_ops mod_miscops;
static struct modlmisc modlmisc = {
&mod_miscops,
- "Cardbus Configurator support %I%",
+ "Cardbus Configurator support",
};
static struct modlinkage modlinkage = {
@@ -286,7 +286,7 @@
if (ddi_getlongprop_buf(DDI_DEV_T_NONE, dip, DDI_PROP_DONTPASS,
"bus-range", (caddr_t)&pci_bus_range, &len) == DDI_SUCCESS) {
cardbus_err(dip, 1, "cardbus_claim_pci_busnum: %u -> %u \n",
- pci_bus_range.lo, pci_bus_range.hi);
+ pci_bus_range.lo, pci_bus_range.hi);
if ((pci_bus_range.lo >= ctrl->range->lo) &&
(pci_bus_range.hi <= ctrl->range->hi)) {
cardbus_err(dip, 1,
@@ -357,7 +357,7 @@
bus_range.lo = 0;
(void) ddi_getlongprop_buf(DDI_DEV_T_NONE, dip,
- DDI_PROP_DONTPASS, "bus-range", (caddr_t)&bus_range, &len);
+ DDI_PROP_DONTPASS, "bus-range", (caddr_t)&bus_range, &len);
bus_range.hi = 255;
(void) ndi_ra_free(dip,
@@ -377,7 +377,7 @@
"cardbus_walk_node_child fails\n");
(void) ndi_prop_update_int_array(DDI_DEV_T_NONE, dip,
- "bus-range", (int *)&bus_range, 2);
+ "bus-range", (int *)&bus_range, 2);
} else {
cardbus_err(dip, 1, "cardbus_fix_hostbridge_busrange "
@@ -425,7 +425,7 @@
cmn_err(CE_WARN,
"%s%d: cardbus instance already initialized!\n",
ddi_driver_name(dip), ddi_get_instance(dip));
- mutex_exit(&cardbus_list_mutex);
+ mutex_exit(&cardbus_list_mutex);
return (DDI_FAILURE);
}
@@ -520,7 +520,7 @@
mutex_enter(&cardbus_list_mutex);
/* get the instance number for the cardbus soft state data */
cb_instance = ddi_prop_get_int(DDI_DEV_T_ANY, dip,
- DDI_PROP_DONTPASS, "cbus-instance", -1);
+ DDI_PROP_DONTPASS, "cbus-instance", -1);
if (cb_instance < 0) {
mutex_exit(&cardbus_list_mutex);
return (DDI_FAILURE); /* no instance is setup for this bus */
@@ -589,7 +589,7 @@
#endif
cb_instance = ddi_prop_get_int(DDI_DEV_T_ANY, dip,
- DDI_PROP_DONTPASS, "cbus-instance", -1);
+ DDI_PROP_DONTPASS, "cbus-instance", -1);
ASSERT(cb_instance >= 0);
cbp = (cbus_t *)ddi_get_soft_state(cardbus_state, cb_instance);
@@ -977,7 +977,7 @@
case DDI_CTLOPS_INITCHILD:
return (cardbus_initchild(rdip, dip, (dev_info_t *)arg,
- result));
+ result));
case DDI_CTLOPS_REPORTDEV:
if (rdip == (dev_info_t *)0)
@@ -1052,7 +1052,7 @@
*ptr++ = '\n';
ASSERT(((caddr_t)ptr - (caddr_t)buf) <
- sizeof (buf));
+ sizeof (buf));
*ptr = '\0';
cardbus_err(dip, 1, buf);
@@ -1170,7 +1170,7 @@
n = pci_config_get8(config_handle, PCI_CONF_CACHE_LINESZ);
if (n != 0)
(void) ndi_prop_update_int(DDI_DEV_T_NONE, child,
- "cache-line-size", n);
+ "cache-line-size", n);
}
/*
@@ -1182,10 +1182,10 @@
if ((header_type & PCI_HEADER_TYPE_M) == PCI_HEADER_ONE) {
latency_timer = cardbus_latency_timer;
pci_config_put8(config_handle, PCI_BCNF_LATENCY_TIMER,
- latency_timer);
+ latency_timer);
} else {
min_gnt = pci_config_get8(config_handle,
- PCI_CONF_MIN_G);
+ PCI_CONF_MIN_G);
/*
* Cardbus os only 33Mhz
@@ -1195,11 +1195,11 @@
}
}
pci_config_put8(config_handle, PCI_CONF_LATENCY_TIMER,
- latency_timer);
+ latency_timer);
n = pci_config_get8(config_handle, PCI_CONF_LATENCY_TIMER);
if (n != 0)
(void) ndi_prop_update_int(DDI_DEV_T_NONE, child,
- "latency-timer", n);
+ "latency-timer", n);
}
pci_config_teardown(&config_handle);
@@ -1266,13 +1266,13 @@
#ifdef sparc
ppd = (struct cardbus_parent_private_data *)
- kmem_zalloc(sizeof (struct cardbus_parent_private_data),
+ kmem_zalloc(sizeof (struct cardbus_parent_private_data),
KM_SLEEP);
#elif defined(__x86) || defined(__amd64)
ppd = (struct cardbus_parent_private_data *)
kmem_zalloc(sizeof (struct cardbus_parent_private_data)
- + sizeof (struct intrspec), KM_SLEEP);
+ + sizeof (struct intrspec), KM_SLEEP);
ppd->ppd.par_intr = (struct intrspec *)(ppd + 1);
(ppd->ppd.par_intr)->intrspec_pri = 0;
@@ -2388,21 +2388,22 @@
if (dip) {
if (instance >= 0)
prom_printf("%s(%d),0x%p: %s%s",
- name, instance, dip, buf, nl);
+ name, instance, (void *)dip,
+ buf, nl);
else
prom_printf("%s,0x%p: %s%s", name,
- dip, buf, nl);
+ (void *)dip, buf, nl);
} else
prom_printf("%s%s", buf, nl);
} else {
if (dip) {
if (instance >= 0)
cmn_err(CE_CONT, "%s(%d),0x%p: %s%s",
- name, instance, (void *) dip,
+ name, instance, (void *)dip,
buf, nl);
else
cmn_err(CE_CONT, "%s,0x%p: %s%s",
- name, (void *) dip, buf, nl);
+ name, (void *)dip, buf, nl);
} else
cmn_err(CE_CONT, "%s%s", buf, nl);
}
--- a/usr/src/uts/common/io/cpc.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/io/cpc.c Thu Jul 31 15:02:18 2008 -0700
@@ -608,7 +608,7 @@
case DATA_TYPE_NVLIST_ARRAY:
if (strcmp(nvpair_name(nvp), "reqs") != 0 ||
nvpair_value_nvlist_array(nvp, &reqlist,
- &nreqs) != 0) {
+ &nreqs) != 0) {
nvlist_free(nvl);
return (EINVAL);
}
@@ -702,7 +702,7 @@
if (nvlist_remove(attrs, "picnum",
DATA_TYPE_UINT64) != 0)
panic("nvlist %p faulty",
- attrs);
+ (void *)attrs);
set->ks_req[i].kr_picnum = uint64;
}
@@ -900,7 +900,7 @@
static struct modldrv modldrv = {
&mod_driverops,
- "cpc sampling driver v%I%",
+ "cpc sampling driver",
&dev_ops
};
--- a/usr/src/uts/common/io/hxge/hxge_ndd.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/io/hxge/hxge_ndd.c Thu Jul 31 15:02:18 2008 -0700
@@ -570,8 +570,8 @@
for (rdc = 0; rdc < p_cfgp->max_rdcs; rdc++) {
print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len,
" %d\t %d\t $%p\t 0x%x\t $%p\n",
- rdc, hxgep->rdc[rdc], rbr_rings[rdc],
- rbr_rings[rdc]->num_blocks, rcr_rings[rdc]);
+ rdc, hxgep->rdc[rdc], (void *)rbr_rings[rdc],
+ rbr_rings[rdc]->num_blocks, (void *)rcr_rings[rdc]);
((mblk_t *)np)->b_wptr += print_len;
buf_len -= print_len;
}
@@ -1183,13 +1183,14 @@
rbr_rings = rx_rbr_rings->rbr_rings;
print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len,
"hxgep (hxge_t) $%p\n dev_regs (dev_regs_t) $%p\n",
- hxgep, hxgep->dev_regs);
+ (void *)hxgep, (void *)hxgep->dev_regs);
ADVANCE_PRINT_BUFFER(np, print_len, buf_len);
/* do register pointers */
print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len,
"reg base (hpi_reg_ptr_t) $%p\t pci reg (hpi_reg_ptr_t) $%p\n",
- hxgep->dev_regs->hxge_regp, hxgep->dev_regs->hxge_pciregp);
+ (void *)hxgep->dev_regs->hxge_regp,
+ (void *)hxgep->dev_regs->hxge_pciregp);
ADVANCE_PRINT_BUFFER(np, print_len, buf_len);
@@ -1219,7 +1220,7 @@
for (rdc = 0; rdc < p_cfgp->max_rdcs; rdc++) {
print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len,
" %d\t $%p\t\t $%p\n",
- rdc, rcr_rings[rdc], rbr_rings[rdc]);
+ rdc, (void *)rcr_rings[rdc], (void *)rbr_rings[rdc]);
ADVANCE_PRINT_BUFFER(np, print_len, buf_len);
}
@@ -1230,7 +1231,7 @@
tx_rings = hxgep->tx_rings->rings;
for (tdc = 0; tdc < p_cfgp->max_tdcs; tdc++) {
print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len,
- " %d\t $%p\n", tdc, tx_rings[tdc]);
+ " %d\t $%p\n", tdc, (void *)tx_rings[tdc]);
ADVANCE_PRINT_BUFFER(np, print_len, buf_len);
}
--- a/usr/src/uts/common/io/pcic.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/io/pcic.c Thu Jul 31 15:02:18 2008 -0700
@@ -401,7 +401,7 @@
static struct modldrv modldrv = {
&mod_driverops, /* Type of module. This one is a driver */
- "PCIC PCMCIA adapter driver %I%", /* Name of the module. */
+ "PCIC PCMCIA adapter driver", /* Name of the module. */
&pcic_devops, /* driver ops */
};
@@ -6731,10 +6731,10 @@
if (dip) {
if (instance >= 0)
prom_printf("%s(%d),0x%p: %s", name,
- instance, dip, buf);
+ instance, (void *)dip, buf);
else
prom_printf("%s,0x%p: %s",
- name, dip, buf);
+ name, (void *)dip, buf);
} else
prom_printf(buf);
} else {
--- a/usr/src/uts/common/io/tl.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/io/tl.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -738,7 +738,7 @@
static struct modldrv modldrv = {
&mod_driverops, /* Type of module -- pseudo driver here */
- "TPI Local Transport (tl) %I%",
+ "TPI Local Transport (tl)",
&tl_devops, /* driver ops */
};
@@ -4430,8 +4430,8 @@
}
return;
} else if (prim->type == T_OPTDATA_REQ &&
- (msz < sizeof (struct T_optdata_req) ||
- !IS_SOCKET(tep))) {
+ (msz < sizeof (struct T_optdata_req) ||
+ !IS_SOCKET(tep))) {
(void) (STRLOG(TL_ID, tep->te_minor, 1,
SL_TRACE|SL_ERROR,
"tl_data:T_OPTDATA_REQ:invalid message"));
@@ -5895,7 +5895,7 @@
(void) (STRLOG(TL_ID, tep->te_minor, 1,
SL_TRACE|SL_ERROR,
- "tl_merror: tep=%p, err=%d", tep, error));
+ "tl_merror: tep=%p, err=%d", (void *)tep, error));
/*
* flush all messages on queue. we are shutting
--- a/usr/src/uts/common/os/condvar.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/os/condvar.c Thu Jul 31 15:02:18 2008 -0700
@@ -70,7 +70,8 @@
ASSERT(THREAD_LOCK_HELD(t));
if (cvp == NULL)
- panic("cv_unsleep: thread %p not on sleepq %p", t, sqh);
+ panic("cv_unsleep: thread %p not on sleepq %p",
+ (void *)t, (void *)sqh);
DTRACE_SCHED1(wakeup, kthread_t *, t);
sleepq_unsleep(t);
if (cvp->cv_waiters != CV_MAX_WAITERS)
@@ -92,7 +93,7 @@
ASSERT(&SQHASH(cvp)->sq_queue == sqp);
if (cvp == NULL)
- panic("cv_change_pri: %p not on sleep queue", t);
+ panic("cv_change_pri: %p not on sleep queue", (void *)t);
sleepq_dequeue(t);
*t_prip = pri;
sleepq_insert(sqp, t);
--- a/usr/src/uts/common/os/kstat_fr.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/os/kstat_fr.c Thu Jul 31 15:02:18 2008 -0700
@@ -600,7 +600,8 @@
{
if (knp->data_type != KSTAT_DATA_STRING)
panic("kstat_named_setstr('%p', '%p'): "
- "named kstat is not of type KSTAT_DATA_STRING", knp, src);
+ "named kstat is not of type KSTAT_DATA_STRING",
+ (void *)knp, (void *)src);
KSTAT_NAMED_STR_PTR(knp) = (char *)src;
if (src != NULL)
--- a/usr/src/uts/common/os/mem_cage.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/os/mem_cage.c Thu Jul 31 15:02:18 2008 -0700
@@ -399,7 +399,7 @@
btop(ml->size), d);
if (ret)
panic("kcage_range_add_internal failed: "
- "ml=%p, ret=0x%x\n", ml, ret);
+ "ml=%p, ret=0x%x\n", (void *)ml, ret);
ml = (d == KCAGE_DOWN ? ml->prev : ml->next);
}
--- a/usr/src/uts/common/os/memlist_new.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/os/memlist_new.c Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -141,7 +140,8 @@
return;
}
if (cur->address + cur->size > start)
- panic("munged memory list = 0x%p\n", curmemlistp);
+ panic("munged memory list = 0x%p\n",
+ (void *)curmemlistp);
}
new->next = NULL;
new->prev = last;
--- a/usr/src/uts/common/os/rctl.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/os/rctl.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -1828,7 +1828,7 @@
alloc_values->rcv_next = tmp_val;
if (rctl_val_list_insert(&rctl->rc_values,
- alloc_values) == 0) {
+ alloc_values) == 0) {
/* inserted move alloc_values on */
alloc_values = tmp_val;
modified = 1;
@@ -1938,7 +1938,7 @@
alloc_values->rcv_next = tmp_val;
if (rctl_val_list_insert(&rctl->rc_values,
- alloc_values) == 0) {
+ alloc_values) == 0) {
/* inserted, so move alloc_values on */
alloc_values = tmp_val;
}
@@ -2402,7 +2402,7 @@
if (mod_hash_insert(rctl_dict, (mod_hash_key_t)(uintptr_t)rctl->rc_id,
(mod_hash_val_t)rctl))
panic("unable to insert rctl %s/%u (%p)", name,
- (uint_t)rctl->rc_id, rctl);
+ (uint_t)rctl->rc_id, (void *)rctl);
/*
* 3a. Insert rctl_dict_entry_t * in appropriate entity list.
@@ -2696,7 +2696,7 @@
if (e == NULL) {
rctl_entity_obtain_entity_p(lrctl->rc_dict_entry->rcd_entity,
- p, &e_tmp);
+ p, &e_tmp);
e = &e_tmp;
}
@@ -2795,7 +2795,7 @@
*/
if (e == NULL) {
rctl_entity_obtain_entity_p(lrctl->rc_dict_entry->rcd_entity,
- p, &e_tmp);
+ p, &e_tmp);
e = &e_tmp;
}
@@ -3053,8 +3053,8 @@
(void) snprintf(name, KSTAT_STRLEN, "%s_%d", ks_name, ks_instance);
if ((ksp = kstat_create_zone("caps", ks_zoneid,
- name, ks_class, ks_type,
- ks_ndata, ks_flags, ks_zoneid)) != NULL) {
+ name, ks_class, ks_type,
+ ks_ndata, ks_flags, ks_zoneid)) != NULL) {
if (ks_zoneid != GLOBAL_ZONEID)
kstat_zone_add(ksp, GLOBAL_ZONEID);
}
--- a/usr/src/uts/common/os/vmem.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/os/vmem.c Thu Jul 31 15:02:18 2008 -0700
@@ -503,10 +503,10 @@
if (vsp == NULL)
panic("vmem_hash_delete(%p, %lx, %lu): bad free",
- vmp, addr, size);
+ (void *)vmp, addr, size);
if (VS_SIZE(vsp) != size)
panic("vmem_hash_delete(%p, %lx, %lu): wrong size (expect %lu)",
- vmp, addr, size, VS_SIZE(vsp));
+ (void *)vmp, addr, size, VS_SIZE(vsp));
vmp->vm_kstat.vk_free.value.ui64++;
vmp->vm_kstat.vk_mem_inuse.value.ui64 -= size;
@@ -558,7 +558,7 @@
if ((start | end) & (vmp->vm_quantum - 1))
panic("vmem_span_create(%p, %p, %lu): misaligned",
- vmp, vaddr, size);
+ (void *)vmp, vaddr, size);
span = vmem_seg_create(vmp, vmp->vm_seg0.vs_aprev, start, end);
span->vs_type = VMEM_SPAN;
@@ -1330,7 +1330,8 @@
vmem_add(vmem_t *vmp, void *vaddr, size_t size, int vmflag)
{
if (vaddr == NULL || size == 0)
- panic("vmem_add(%p, %p, %lu): bad arguments", vmp, vaddr, size);
+ panic("vmem_add(%p, %p, %lu): bad arguments",
+ (void *)vmp, vaddr, size);
ASSERT(!vmem_contains(vmp, vaddr, size));
--- a/usr/src/uts/common/vm/page_lock.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/common/vm/page_lock.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -634,7 +634,7 @@
if (CV_HAS_WAITERS(&pp->p_cv))
cv_broadcast(&pp->p_cv);
} else if ((old & ~SE_EWANTED) == SE_DELETED) {
- panic("page_unlock_nocapture: page %p is deleted", pp);
+ panic("page_unlock_nocapture: page %p is deleted", (void *)pp);
} else if (old < 0) {
THREAD_KPRI_RELEASE();
pp->p_selock &= SE_EWANTED;
@@ -643,7 +643,8 @@
} else if ((old & ~SE_EWANTED) > SE_READER) {
pp->p_selock = old - SE_READER;
} else {
- panic("page_unlock_nocapture: page %p is not locked", pp);
+ panic("page_unlock_nocapture: page %p is not locked",
+ (void *)pp);
}
mutex_exit(pse);
@@ -667,7 +668,7 @@
if (CV_HAS_WAITERS(&pp->p_cv))
cv_broadcast(&pp->p_cv);
} else if ((old & ~SE_EWANTED) == SE_DELETED) {
- panic("page_unlock: page %p is deleted", pp);
+ panic("page_unlock: page %p is deleted", (void *)pp);
} else if (old < 0) {
THREAD_KPRI_RELEASE();
pp->p_selock &= SE_EWANTED;
@@ -676,7 +677,7 @@
} else if ((old & ~SE_EWANTED) > SE_READER) {
pp->p_selock = old - SE_READER;
} else {
- panic("page_unlock: page %p is not locked", pp);
+ panic("page_unlock: page %p is not locked", (void *)pp);
}
if (pp->p_selock == 0) {
--- a/usr/src/uts/i86pc/vm/hat_i86.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/i86pc/vm/hat_i86.c Thu Jul 31 15:02:18 2008 -0700
@@ -1452,7 +1452,8 @@
*/
ASSERT(ht->ht_busy > 0);
if (ht->ht_vaddr > va || va > HTABLE_LAST_PAGE(ht))
- panic("hati_load_common: bad htable %p, va %p", ht, (void *)va);
+ panic("hati_load_common: bad htable %p, va %p",
+ (void *)ht, (void *)va);
ASSERT(ht->ht_level == level);
/*
@@ -1866,7 +1867,7 @@
if (ht->ht_lock_cnt < 1)
panic("hat_unlock(): lock_cnt < 1, "
- "htable=%p, vaddr=%p\n", ht, (caddr_t)vaddr);
+ "htable=%p, vaddr=%p\n", (void *)ht, (void *)vaddr);
HTABLE_LOCK_DEC(ht);
vaddr += LEVEL_SIZE(ht->ht_level);
@@ -3856,7 +3857,7 @@
}
if (PTE_ISVALID(oldpte))
panic("hat_mempte_setup(): address already mapped"
- "ht=%p, entry=%d, pte=" FMT_PTE, ht, entry, oldpte);
+ "ht=%p, entry=%d, pte=" FMT_PTE, (void *)ht, entry, oldpte);
/*
* increment ht_valid_cnt so that the pagetable can't disappear
@@ -4276,7 +4277,8 @@
int
hat_kpm_fault(hat_t *hat, caddr_t vaddr)
{
- panic("pagefault in seg_kpm. hat: 0x%p vaddr: 0x%p", hat, vaddr);
+ panic("pagefault in seg_kpm. hat: 0x%p vaddr: 0x%p",
+ (void *)hat, (void *)vaddr);
return (0);
}
--- a/usr/src/uts/i86pc/vm/htable.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/i86pc/vm/htable.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -1368,7 +1368,8 @@
if (l == level && shared && ht->ht_shares &&
ht->ht_shares != shared) {
panic("htable shared from wrong place "
- "found htable=%p shared=%p", ht, shared);
+ "found htable=%p shared=%p",
+ (void *)ht, (void *)shared);
}
++ht->ht_busy;
HTABLE_EXIT(h);
--- a/usr/src/uts/i86pc/vm/vm_machdep.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/i86pc/vm/vm_machdep.c Thu Jul 31 15:02:18 2008 -0700
@@ -1072,10 +1072,10 @@
while (cnt-- > 0) {
if (pa_to_ma(pfn_to_pa(pp->p_pagenum)) <
dma_attr->dma_attr_addr_lo)
- panic("PFN (pp=%p) below dma_attr_addr_lo", pp);
+ panic("PFN (pp=%p) below dma_attr_addr_lo", (void *)pp);
if (pa_to_ma(pfn_to_pa(pp->p_pagenum)) >=
dma_attr->dma_attr_addr_hi)
- panic("PFN (pp=%p) above dma_attr_addr_hi", pp);
+ panic("PFN (pp=%p) above dma_attr_addr_hi", (void *)pp);
pp = pp->p_next;
}
}
@@ -3739,7 +3739,7 @@
#ifdef DEBUG
pp = page_exists(&kvp, offset);
if (pp != NULL)
- panic("page already exists %p", pp);
+ panic("page already exists %p", (void *)pp);
#endif
pp = page_create_va(&kvp, offset, MMU_PAGESIZE, PG_EXCL,
--- a/usr/src/uts/i86xpv/os/xpv_panic.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/i86xpv/os/xpv_panic.c Thu Jul 31 15:02:18 2008 -0700
@@ -478,11 +478,11 @@
getcregs(&creg);
ti.trap_addr = (caddr_t)creg.cr_cr2;
panic("Fatal pagefault at 0x%lx. fault addr=0x%p rp=0x%p",
- rp->r_pc, ti.trap_addr, rp);
+ rp->r_pc, (void *)ti.trap_addr, (void *)rp);
} else {
ti.trap_addr = (caddr_t)rp->r_pc;
panic("Fatal trap %ld at 0x%lx. rp=0x%p", rp->r_trapno,
- rp->r_pc, rp);
+ rp->r_pc, (void *)rp);
}
}
--- a/usr/src/uts/intel/io/dktp/hba/ghd/ghd.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/intel/io/dktp/hba/ghd/ghd.c Thu Jul 31 15:02:18 2008 -0700
@@ -401,7 +401,7 @@
mutex_enter(hba_mutexp);
GDBG_INTR(("ghd_intr(): cccp=0x%p status=0x%p\n",
- cccp, intr_status));
+ (void *)cccp, intr_status));
for (;;) {
more = FALSE;
@@ -423,7 +423,7 @@
continue;
}
GDBG_INTR(("ghd_intr(): done cccp=0x%p status=0x%p rc %d\n",
- cccp, intr_status, rc));
+ (void *)cccp, intr_status, rc));
/*
* Release the mutexes in the opposite order that they
* were acquired to prevent requests queued by
@@ -746,7 +746,7 @@
GDBG_START(("ghd_transport: polled"
" cccp 0x%p gdevp 0x%p gtgtp 0x%p gcmdp 0x%p\n",
- cccp, gdevp, gtgtp, gcmdp));
+ (void *)cccp, (void *)gdevp, (void *)gtgtp, (void *)gcmdp));
/*
* Lock the doneq so no other thread flushes the Q.
@@ -757,7 +757,7 @@
else {
GDBG_START(("ghd_transport: non-polled"
" cccp 0x%p gdevp 0x%p gtgtp 0x%p gcmdp 0x%p\n",
- cccp, gdevp, gtgtp, gcmdp));
+ (void *)cccp, (void *)gdevp, (void *)gtgtp, (void *)gcmdp));
}
#endif
/*
@@ -788,11 +788,13 @@
*/
if (!mutex_tryenter(&cccp->ccc_hba_mutex)) {
/* The HBA mutex isn't available */
- GDBG_START(("ghd_transport: !mutex cccp 0x%p\n", cccp));
+ GDBG_START(("ghd_transport: !mutex cccp 0x%p\n",
+ (void *)cccp));
mutex_exit(&cccp->ccc_waitq_mutex);
return (TRAN_ACCEPT);
}
- GDBG_START(("ghd_transport: got mutex cccp 0x%p\n", cccp));
+ GDBG_START(("ghd_transport: got mutex cccp 0x%p\n",
+ (void *)cccp));
/*
* start as many requests as possible from the head
@@ -824,7 +826,7 @@
/* call HBA's completion function but don't do callback to target */
(*cccp->ccc_hba_complete)(cccp->ccc_hba_handle, gcmdp, FALSE);
- GDBG_START(("ghd_transport: polled done cccp 0x%p\n", cccp));
+ GDBG_START(("ghd_transport: polled done cccp 0x%p\n", (void *)cccp));
return (TRAN_ACCEPT);
}
--- a/usr/src/uts/intel/io/dktp/hba/ghd/ghd_dma.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/intel/io/dktp/hba/ghd/ghd_dma.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -31,7 +31,7 @@
void
ghd_dmafree_attr(gcmd_t *gcmdp)
{
- GDBG_DMA(("ghd_dma_attr_free: gcmdp 0x%p\n", gcmdp));
+ GDBG_DMA(("ghd_dma_attr_free: gcmdp 0x%p\n", (void *)gcmdp));
if (gcmdp->cmd_dma_handle != NULL) {
if (ddi_dma_unbind_handle(gcmdp->cmd_dma_handle) !=
@@ -39,7 +39,8 @@
cmn_err(CE_WARN, "ghd dma free attr: "
"unbind handle failed");
ddi_dma_free_handle(&gcmdp->cmd_dma_handle);
- GDBG_DMA(("ghd_dma_attr_free: ddi_dma_free 0x%p\n", gcmdp));
+ GDBG_DMA(("ghd_dma_attr_free: ddi_dma_free 0x%p\n",
+ (void *)gcmdp));
gcmdp->cmd_dma_handle = NULL;
gcmdp->cmd_ccount = 0;
gcmdp->cmd_totxfer = 0;
@@ -59,7 +60,7 @@
int status;
GDBG_DMA(("ghd_dma_attr_get: start: gcmdp 0x%p sg_attrp 0x%p\n",
- gcmdp, sg_attrp));
+ (void *)gcmdp, (void *)sg_attrp));
/*
@@ -69,7 +70,7 @@
ASSERT(gcmdp->cmd_dma_handle == NULL);
status = ddi_dma_alloc_handle(cccp->ccc_hba_dip, sg_attrp, callback,
- arg, &gcmdp->cmd_dma_handle);
+ arg, &gcmdp->cmd_dma_handle);
if (status != DDI_SUCCESS) {
bp->b_error = 0;
@@ -77,12 +78,11 @@
}
status = ddi_dma_buf_bind_handle(gcmdp->cmd_dma_handle, bp, dma_flags,
- callback, arg, &gcmdp->cmd_first_cookie,
- &gcmdp->cmd_ccount);
+ callback, arg, &gcmdp->cmd_first_cookie, &gcmdp->cmd_ccount);
GDBG_DMA(("ghd_dma_attr_get: setup: gcmdp 0x%p status %d h 0x%p "
- "c 0x%d\n", gcmdp, status, gcmdp->cmd_dma_handle,
- gcmdp->cmd_ccount));
+ "c 0x%d\n", (void *)gcmdp, status, (void *)gcmdp->cmd_dma_handle,
+ gcmdp->cmd_ccount));
switch (status) {
case DDI_DMA_MAPPED:
@@ -93,7 +93,7 @@
case DDI_DMA_PARTIAL_MAP:
/* enable first call to ddi_dma_getwin */
if (ddi_dma_numwin(gcmdp->cmd_dma_handle, &gcmdp->cmd_wcount) !=
- DDI_SUCCESS) {
+ DDI_SUCCESS) {
bp->b_error = 0;
ddi_dma_free_handle(&gcmdp->cmd_dma_handle);
gcmdp->cmd_dma_handle = NULL;
@@ -141,7 +141,7 @@
int single_seg;
GDBG_DMA(("ghd_dma_attr_get: start: gcmdp 0x%p h 0x%p c 0x%x\n",
- gcmdp, gcmdp->cmd_dma_handle, gcmdp->cmd_ccount));
+ (void *)gcmdp, (void *)gcmdp->cmd_dma_handle, gcmdp->cmd_ccount));
/*
* Disable single-segment Scatter/Gather option
@@ -224,8 +224,8 @@
* start the next window, and get its first cookie
*/
status = ddi_dma_getwin(gcmdp->cmd_dma_handle,
- gcmdp->cmd_windex, &offset, &length,
- &cookie, &gcmdp->cmd_ccount);
+ gcmdp->cmd_windex, &offset, &length,
+ &cookie, &gcmdp->cmd_ccount);
if (status != DDI_SUCCESS)
return (FALSE);
--- a/usr/src/uts/intel/io/dktp/hba/ghd/ghd_scsa.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/intel/io/dktp/hba/ghd/ghd_scsa.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -73,8 +73,8 @@
if (gcmdp->cmd_dma_handle) {
status = ddi_dma_sync(gcmdp->cmd_dma_handle, 0, 0,
- (gcmdp->cmd_dma_flags & DDI_DMA_READ) ?
- DDI_DMA_SYNC_FORCPU : DDI_DMA_SYNC_FORDEV);
+ (gcmdp->cmd_dma_flags & DDI_DMA_READ) ?
+ DDI_DMA_SYNC_FORCPU : DDI_DMA_SYNC_FORDEV);
if (status != DDI_SUCCESS) {
cmn_err(CE_WARN, "ghd_tran_sync_pkt() fail\n");
}
@@ -153,7 +153,7 @@
struct scsi_pkt *pktp)
{
GDBG_PKT(("ghd_pktfree: cccp 0x%p ap 0x%p pktp 0x%p\n",
- cccp, ap, pktp));
+ (void *)cccp, (void *)ap, (void *)pktp));
/* free any extra resources allocated by the HBA */
(*cccp->ccc_ccbfree)(PKTP2GCMDP(pktp));
@@ -201,7 +201,7 @@
gcmdp = PKTP2GCMDP(pktp);
GDBG_PKT(("ghd_tran_init_pkt_attr: gcmdp 0x%p dma_handle 0x%p\n",
- gcmdp, gcmdp->cmd_dma_handle));
+ (void *)gcmdp, (void *)gcmdp->cmd_dma_handle));
/*
* free stale DMA window if necessary.
@@ -218,7 +218,7 @@
*/
GDBG_PKT(("ghd_tran_init_pkt: gcmdp 0x%p bp 0x%p limp 0x%p\n",
- gcmdp, bp, sg_attrp));
+ (void *)gcmdp, (void *)bp, (void *)sg_attrp));
if (bp && bp->b_bcount && sg_attrp) {
int dma_flags;
@@ -237,7 +237,7 @@
if (gcmdp->cmd_dma_handle == NULL) {
if (!ghd_dma_buf_bind_attr(cccp, gcmdp, bp, dma_flags,
- callback, arg, sg_attrp)) {
+ callback, arg, sg_attrp)) {
if (new_pkt)
ghd_pktfree(cccp, ap, pktp);
return (NULL);
@@ -246,8 +246,8 @@
/* map the buffer and/or create the scatter/gather list */
if (!ghd_dmaget_attr(cccp, gcmdp,
- bp->b_bcount - gcmdp->cmd_totxfer,
- sg_attrp->dma_attr_sgllen, &xfercount)) {
+ bp->b_bcount - gcmdp->cmd_totxfer,
+ sg_attrp->dma_attr_sgllen, &xfercount)) {
if (new_pkt)
ghd_pktfree(cccp, ap, pktp);
return (NULL);
--- a/usr/src/uts/intel/io/dktp/hba/ghd/ghd_timer.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/intel/io/dktp/hba/ghd/ghd_timer.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -128,7 +128,7 @@
ghd_timer_init(&tmr_conf, 0);
return ((err = mod_install(&modlinkage)) != 0)
- ghd_timer_fini(&tmr_conf);
+ ghd_timer_fini(&tmr_conf);
return (err);
}
@@ -419,7 +419,7 @@
} else {
scsi_log(cccp->ccc_hba_dip, cccp->ccc_label, CE_WARN,
"timeout: %s, target=%d lun=%d", msgp,
- gtgtp->gt_target, gtgtp->gt_lun);
+ gtgtp->gt_target, gtgtp->gt_lun);
}
/*
@@ -604,7 +604,7 @@
while (gcmdp = ghd_timeout_get(cccp)) {
GDBG_INTR(("?ghd_timer_poll: cccp=0x%p gcmdp=0x%p\n",
- cccp, gcmdp));
+ (void *)cccp, (void *)gcmdp));
switch (gcmdp->cmd_state) {
case GCMD_STATE_IDLE:
@@ -709,7 +709,7 @@
if (tmrp->t_refs++ == 0) {
/* establish the timeout callback */
tmrp->t_timeout_id = timeout(ghd_timeout, (void *)tmrp,
- tmrp->t_ticks);
+ tmrp->t_ticks);
}
mutex_exit(&tglobal_mutex);
}
--- a/usr/src/uts/intel/io/dktp/hba/ghd/ghd_waitq.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/intel/io/dktp/hba/ghd/ghd_waitq.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -91,8 +91,8 @@
while (gdevp != NULL) {
if (gdevp->gd_target == target && gdevp->gd_lun == lun) {
GDBG_WAITQ(("ghd_target_init(%d,%d) found gdevp 0x%p"
- " gtgtp 0x%p max %lu\n",
- target, lun, gdevp, gtgtp, maxactive));
+ " gtgtp 0x%p max %lu\n", target, lun,
+ (void *)gdevp, (void *)gtgtp, maxactive));
goto foundit;
}
@@ -117,7 +117,8 @@
GDEV_QATTACH(gdevp, cccp, maxactive);
GDBG_WAITQ(("ghd_target_init(%d,%d) new gdevp 0x%p gtgtp 0x%p"
- " max %lu\n", target, lun, gdevp, gtgtp, maxactive));
+ " max %lu\n", target, lun, (void *)gdevp, (void *)gtgtp,
+ maxactive));
foundit:
@@ -144,7 +145,7 @@
gdev_t *gdevp = gtgtp->gt_gdevp;
GDBG_WAITQ(("ghd_target_free(%d,%d) gdevp-0x%p gtgtp 0x%p\n",
- gtgtp->gt_target, gtgtp->gt_lun, gdevp, gtgtp));
+ gtgtp->gt_target, gtgtp->gt_lun, (void *)gdevp, (void *)gtgtp));
/*
* grab both mutexes so the queue structures
@@ -163,7 +164,8 @@
kmem_free((caddr_t)gtgtp, gtgtp->gt_size);
if (gdevp->gd_ninstances == 1) {
- GDBG_WAITQ(("ghd_target_free: N=1 gdevp 0x%p\n", gdevp));
+ GDBG_WAITQ(("ghd_target_free: N=1 gdevp 0x%p\n",
+ (void *)gdevp));
/*
* If there's now just one instance left attached to this
* device then reset the queue's max active value
@@ -174,7 +176,8 @@
} else if (gdevp->gd_ninstances == 0) {
/* else no instances left */
- GDBG_WAITQ(("ghd_target_free: N=0 gdevp 0x%p\n", gdevp));
+ GDBG_WAITQ(("ghd_target_free: N=0 gdevp 0x%p\n",
+ (void *)gdevp));
/* detach this per-dev-structure from the HBA's dev list */
GDEV_QDETACH(gdevp, cccp);
@@ -184,7 +187,8 @@
#if defined(GHD_DEBUG) || defined(__lint)
else {
/* leave maxactive set to 1 */
- GDBG_WAITQ(("ghd_target_free: N>1 gdevp 0x%p\n", gdevp));
+ GDBG_WAITQ(("ghd_target_free: N>1 gdevp 0x%p\n",
+ (void *)gdevp));
}
#endif
@@ -199,7 +203,7 @@
ASSERT(mutex_owned(&cccp->ccc_waitq_mutex));
GDBG_WAITQ(("ghd_waitq_shuffle_up: cccp 0x%p gdevp 0x%p N %ld "
- "max %ld\n", cccp, gdevp, GDEV_NACTIVE(gdevp),
+ "max %ld\n", (void *)cccp, (void *)gdevp, GDEV_NACTIVE(gdevp),
GDEV_MAXACTIVE(gdevp)));
for (;;) {
/*
@@ -208,7 +212,7 @@
*/
if (GDEV_NACTIVE(gdevp) >= GDEV_MAXACTIVE(gdevp)) {
GDBG_WAITQ(("ghd_waitq_shuffle_up: N>MAX gdevp 0x%p\n",
- gdevp));
+ (void *)gdevp));
return;
}
@@ -219,7 +223,7 @@
*/
if (gdevp->gd_ninstances > 1 && GDEV_NACTIVE(gdevp) > 0) {
GDBG_WAITQ(("ghd_waitq_shuffle_up: multi gdevp 0x%p\n",
- gdevp));
+ (void *)gdevp));
return;
}
@@ -230,14 +234,14 @@
if ((gcmdp = L2_remove_head(&GDEV_QHEAD(gdevp))) == NULL) {
/* the device is empty so we're done */
GDBG_WAITQ(("ghd_waitq_shuffle_up: MT gdevp 0x%p\n",
- gdevp));
+ (void *)gdevp));
return;
}
L2_add(&GHBA_QHEAD(cccp), &gcmdp->cmd_q, gcmdp);
GDEV_NACTIVE(gdevp)++;
gcmdp->cmd_waitq_level++;
GDBG_WAITQ(("ghd_waitq_shuffle_up: gdevp 0x%p gcmdp 0x%p\n",
- gdevp, gcmdp));
+ (void *)gdevp, (void *)gcmdp));
}
}
@@ -303,7 +307,7 @@
}
GDBG_WAITQ(("ghd_waitq_delete: gcmdp 0x%p qp 0x%p level %ld\n",
- gcmdp, qp, gcmdp->cmd_waitq_level));
+ (void *)gcmdp, (void *)qp, gcmdp->cmd_waitq_level));
/*
@@ -329,15 +333,16 @@
if (L2_EMPTY(&GHBA_QHEAD(cccp))) {
/* return if the list is empty */
GDBG_WAITQ(("ghd_waitq_proc: MT cccp 0x%p qp 0x%p\n",
- cccp, &cccp->ccc_waitq));
+ (void *)cccp, (void *)&cccp->ccc_waitq));
break;
}
if (GHBA_NACTIVE(cccp) >= GHBA_MAXACTIVE(cccp)) {
/* return if the HBA is too active */
GDBG_WAITQ(("ghd_waitq_proc: N>M cccp 0x%p qp 0x%p"
- " N %ld max %ld\n", cccp, &cccp->ccc_waitq,
- GHBA_NACTIVE(cccp),
- GHBA_MAXACTIVE(cccp)));
+ " N %ld max %ld\n", (void *)cccp,
+ (void *)&cccp->ccc_waitq,
+ GHBA_NACTIVE(cccp),
+ GHBA_MAXACTIVE(cccp)));
break;
}
@@ -395,14 +400,14 @@
gcmdp->cmd_waitq_level--;
L2_add_head(&GHBA_QHEAD(cccp), &gcmdp->cmd_q, gcmdp);
GDBG_WAITQ(("ghd_waitq_proc: busy cccp 0x%p gcmdp 0x%p"
- " handle 0x%p\n", cccp, gcmdp,
- cccp->ccc_hba_handle));
+ " handle 0x%p\n", (void *)cccp, (void *)gcmdp,
+ cccp->ccc_hba_handle));
break;
}
rc = TRUE;
mutex_enter(&cccp->ccc_waitq_mutex);
GDBG_WAITQ(("ghd_waitq_proc: ++ cccp 0x%p gcmdp 0x%p N %ld\n",
- cccp, gcmdp, GHBA_NACTIVE(cccp)));
+ (void *)cccp, (void *)gcmdp, GHBA_NACTIVE(cccp)));
}
ASSERT(mutex_owned(&cccp->ccc_hba_mutex));
ASSERT(mutex_owned(&cccp->ccc_waitq_mutex));
@@ -415,7 +420,8 @@
ASSERT(mutex_owned(&cccp->ccc_hba_mutex));
ASSERT(mutex_owned(&cccp->ccc_waitq_mutex));
- GDBG_WAITQ(("ghd_waitq_process_and_mutex_exit: cccp 0x%p\n", cccp));
+ GDBG_WAITQ(("ghd_waitq_process_and_mutex_exit: cccp 0x%p\n",
+ (void *)cccp));
(void) ghd_waitq_process_and_mutex_hold(cccp);
--- a/usr/src/uts/sfmmu/vm/hat_sfmmu.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.c Thu Jul 31 15:02:18 2008 -0700
@@ -2955,7 +2955,7 @@
* space be >= USERLIMIT.
*/
if (!TTE_IS_PRIVILEGED(ttep) && vaddr >= (caddr_t)USERLIMIT)
- panic("user addr %p in kernel space", vaddr);
+ panic("user addr %p in kernel space", (void *)vaddr);
#if defined(TTE_IS_GLOBAL)
if (TTE_IS_GLOBAL(ttep))
panic("sfmmu_tteload: creating global tte");
@@ -3990,7 +3990,7 @@
}
if (ttesz < HBLK_MIN_TTESZ) {
panic("hat_unlock_region: addr not found "
- "addr %p hat %p", va, sfmmup);
+ "addr %p hat %p", (void *)va, (void *)sfmmup);
}
}
sfmmu_hblks_list_purge(&list);
@@ -4356,7 +4356,7 @@
}
if (!PAGE_LOCKED(pp) && !panicstr)
- panic("hat_add_callback: page 0x%p not locked", pp);
+ panic("hat_add_callback: page 0x%p not locked", (void *)pp);
if (osfhmep->hme_page != pp || pp->p_vnode != vp ||
pp->p_offset != off) {
@@ -6010,7 +6010,8 @@
if (pp != NULL) {
panic("sfmmu_hblk_unload: pp = 0x%p "
"tte became invalid under mlist"
- " lock = 0x%p", pp, pml);
+ " lock = 0x%p", (void *)pp,
+ (void *)pml);
}
continue;
}
@@ -6988,7 +6989,7 @@
HAT_CB_ERR_LEAKED, pahmep->pvt) == 0)
return; /* non-fatal */
}
- panic("pa_hment leaked: 0x%p", pahmep);
+ panic("pa_hment leaked: 0x%p", (void *)pahmep);
}
/*
@@ -7817,9 +7818,11 @@
* page_create_va()) for VA->PA translations to be valid.
*/
if (!PP_ISNORELOC(pp))
- panic("Illegal VA->PA translation, pp 0x%p not permanent", pp);
+ panic("Illegal VA->PA translation, pp 0x%p not permanent",
+ (void *)pp);
else
- panic("Illegal VA->PA translation, pp 0x%p not locked", pp);
+ panic("Illegal VA->PA translation, pp 0x%p not locked",
+ (void *)pp);
}
#endif /* DEBUG */
@@ -14524,13 +14527,14 @@
return;
} else {
panic("shctx: sfmmu 0x%p found on scd"
- "list 0x%p", sfmmup, *headp);
+ "list 0x%p", (void *)sfmmup,
+ (void *)*headp);
}
}
}
if (onlist) {
panic("shctx: sfmmu 0x%p not found on scd list 0x%p",
- sfmmup, *headp);
+ (void *)sfmmup, (void *)*headp);
} else {
return;
}
--- a/usr/src/uts/sun4/io/rootnex.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4/io/rootnex.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -212,7 +212,7 @@
static struct modldrv modldrv = {
&mod_driverops, /* Type of module. This one is a nexus driver */
- "sun4 root nexus %I%",
+ "sun4 root nexus",
&rootnex_ops, /* Driver ops */
};
@@ -384,7 +384,7 @@
}
}
- DPRINTF(ROOTNEX_MAP_DEBUG, ("at virtual 0x%p\n", *vaddrp));
+ DPRINTF(ROOTNEX_MAP_DEBUG, ("at virtual 0x%p\n", (void *)*vaddrp));
return (0);
}
@@ -647,7 +647,7 @@
DPRINTF(ROOTNEX_INTR_DEBUG, ("rootnex_intr_ops: rdip=%s%d "
"intr_op 0x%x hdlp 0x%p\n", ddi_driver_name(rdip),
- ddi_get_instance(rdip), intr_op, hdlp));
+ ddi_get_instance(rdip), intr_op, (void *)hdlp));
switch (intr_op) {
case DDI_INTROP_GETCAP:
@@ -721,7 +721,7 @@
extern struct seg_ops segdev_ops;
DPRINTF(ROOTNEX_MAP_DEBUG, ("rootnex_map_fault: address <%p> "
- "pfn <%lx>", addr, pfn));
+ "pfn <%lx>", (void *)addr, pfn));
DPRINTF(ROOTNEX_MAP_DEBUG, (" Seg <%s>\n",
seg->s_ops == &segdev_ops ? "segdev" :
seg == &kvseg ? "segkmem" : "NONE!"));
--- a/usr/src/uts/sun4/os/ddi_impl.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4/os/ddi_impl.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -529,7 +529,7 @@
if (debug)
prom_printf("reg cell size 0x%x, intr cell size 0x%x, "
"match_request 0x%p, imap 0x%p\n", addr_cells, intr_cells,
- match_req, imap);
+ (void *)match_req, (void *)imap);
#endif
/*
@@ -554,7 +554,7 @@
ASSERT(intr_parent_dip != 0);
#ifdef DEBUG
if (debug)
- prom_printf("scan 0x%p\n", scan);
+ prom_printf("scan 0x%p\n", (void *)scan);
#endif
/*
* The tmp_dip describes the new domain, get it's interrupt
@@ -602,13 +602,15 @@
#ifdef DEBUG
if (debug)
- prom_printf("dip 0x%p\n", intr_parent_dip);
+ prom_printf("dip 0x%p\n",
+ (void *)intr_parent_dip);
#endif
break;
} else {
#ifdef DEBUG
if (debug)
- prom_printf("dip 0x%p\n", intr_parent_dip);
+ prom_printf("dip 0x%p\n",
+ (void *)intr_parent_dip);
#endif
ndi_rele_devi(intr_parent_dip);
intr_parent_dip = NULL;
--- a/usr/src/uts/sun4/os/prom_subr.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4/os/prom_subr.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -340,10 +340,12 @@
return; /* do not modify lock further if we have panicked */
if (prom_cpu != cp)
- panic("kern_postprom: not owner, cp=%p owner=%p", cp, prom_cpu);
+ panic("kern_postprom: not owner, cp=%p owner=%p",
+ (void *)cp, (void *)prom_cpu);
if (prom_holdcnt == 0)
- panic("kern_postprom: prom_holdcnt == 0, owner=%p", prom_cpu);
+ panic("kern_postprom: prom_holdcnt == 0, owner=%p",
+ (void *)prom_cpu);
if (atomic_add_32_nv(&prom_holdcnt, -1) != 0)
return; /* prom lock is held recursively by this CPU */
--- a/usr/src/uts/sun4u/io/isadma.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4u/io/isadma.c Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -231,7 +230,7 @@
*/
instance = ddi_get_instance(dip);
if (ddi_soft_state_zalloc(per_isadma_state, instance)
- != DDI_SUCCESS) {
+ != DDI_SUCCESS) {
ret = DDI_FAILURE;
goto exit;
}
@@ -277,7 +276,7 @@
{
int instance = ddi_get_instance(dip);
isadma_devstate_t *isadmap =
- ddi_get_soft_state(per_isadma_state, instance);
+ ddi_get_soft_state(per_isadma_state, instance);
switch (cmd) {
case DDI_DETACH:
@@ -638,8 +637,8 @@
child_regp = regp + rnumber;
DPRINTF(ISADMA_MAP_DEBUG, ("isadma_map: child regp %p "
- "parent regp %p Child reg array %p\n", child_regp,
- isadmap->isadma_regp, regp));
+ "parent regp %p Child reg array %p\n", (void *)child_regp,
+ (void *)isadmap->isadma_regp, (void *)regp));
/* Figure out if we're mapping or unmapping */
switch (mp->map_op) {
@@ -688,7 +687,7 @@
/* Call up tree to tear down mapping */
ret = (DEVI(pdip)->devi_ops->devo_bus_ops->bus_map)
- (pdip, rdip, mp, off, len, addrp);
+ (pdip, rdip, mp, off, len, addrp);
break;
default:
--- a/usr/src/uts/sun4u/io/pmubus.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4u/io/pmubus.c Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -413,7 +412,7 @@
value = pci_config_get8(softsp->pmubus_reghdl, offset) & mask;
DPRINTF(PMUBUS_RW_DEBUG, ("pmubus_get8: addr=%p offset=%lx value=%x "
- "mask=%x\n", addr, offset, value, mask));
+ "mask=%x\n", (void *)addr, offset, value, mask));
return (value);
}
@@ -456,7 +455,7 @@
value = pci_config_get32(softsp->pmubus_reghdl, offset) & mask;
DPRINTF(PMUBUS_RW_DEBUG, ("pmubus_get32: addr=%p offset=%lx value=%x "
- "mask=%x\n", addr, offset, value, mask));
+ "mask=%x\n", (void *)addr, offset, value, mask));
return (value);
}
@@ -486,7 +485,7 @@
* Process "bit lane" register
*/
DPRINTF(PMUBUS_RW_DEBUG, ("pmubus_put8: addr=%p offset=%lx "
- "value=%x mask=%lx\n", addr, offset, value,
+ "value=%x mask=%lx\n", (void *)addr, offset, value,
pmubus_mapreqp->mapreq_mask));
if (addr != 0 ||
@@ -508,7 +507,7 @@
* Process shared register
*/
DPRINTF(PMUBUS_RW_DEBUG, ("pmubus_put8: addr=%p offset=%lx "
- "value=%x\n", addr, offset, value));
+ "value=%x\n", (void *)addr, offset, value));
pci_config_put8(softsp->pmubus_reghdl, offset, value);
}
@@ -540,7 +539,7 @@
* Process "bit lane" register
*/
DPRINTF(PMUBUS_RW_DEBUG, ("pmubus_put32: addr=%p offset=%lx "
- "value=%x mask=%lx\n", addr, offset, value,
+ "value=%x mask=%lx\n", (void *)addr, offset, value,
pmubus_mapreqp->mapreq_mask));
if (addr != 0 ||
@@ -562,7 +561,7 @@
* Process shared register
*/
DPRINTF(PMUBUS_RW_DEBUG, ("pmubus_put32: addr=%p offset=%lx "
- "value=%x\n", addr, offset, value));
+ "value=%x\n", (void *)addr, offset, value));
pci_config_put32(softsp->pmubus_reghdl, offset, value);
}
@@ -685,7 +684,7 @@
rnumber = mp->map_obj.rnumber;
DPRINTF(PMUBUS_MAP_DEBUG, ("rdip=%s%d: rnumber=%x "
"handlep=%p\n", ddi_get_name(rdip), ddi_get_instance(rdip),
- rnumber, mp->map_handlep));
+ rnumber, (void *)mp->map_handlep));
if (ddi_getlongprop(DDI_DEV_T_ANY, rdip, DDI_PROP_DONTPASS,
"reg", (caddr_t)&pmubus_regs, &pmubus_regs_size) !=
@@ -731,7 +730,7 @@
ret = DDI_ME_INVAL;
DPRINTF(PMUBUS_MAP_DEBUG, ("rdip=%s%d: pmubus_map: "
"%s is an invalid map type.\nmap request handlep=0x%p\n",
- ddi_get_name(rdip), ddi_get_instance(rdip), s, mp));
+ ddi_get_name(rdip), ddi_get_instance(rdip), s, (void *)mp));
ret = DDI_ME_RNUMBER_RANGE;
goto done;
--- a/usr/src/uts/sun4u/io/sbd.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4u/io/sbd.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -402,7 +402,7 @@
static struct modlmisc modlmisc = {
&mod_miscops,
- "System Board DR v%I%"
+ "System Board DR"
};
static struct modlinkage modlinkage = {
@@ -1620,7 +1620,7 @@
cmdp->cmd_cm.c_opts = (caddr_t)(uintptr_t)scmd32.cmd_cm.c_opts;
if (cmd == SBD_CMD_PASSTHRU) {
- PR_BYP("passthru copyin: iap=%p, sz=%ld", iap,
+ PR_BYP("passthru copyin: iap=%p, sz=%ld", (void *)iap,
sizeof (sbd_cmd32_t));
PR_BYP("passthru copyin: c_opts=%x, c_len=%d",
scmd32.cmd_cm.c_opts,
--- a/usr/src/uts/sun4u/io/sysiosbus.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4u/io/sysiosbus.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -381,7 +381,7 @@
static struct modldrv modldrv = {
&mod_driverops, /* Type of module. This one is a driver */
- "SBus (sysio) nexus driver %I%", /* Name of module. */
+ "SBus (sysio) nexus driver", /* Name of module. */
&sbus_ops, /* driver ops */
};
@@ -536,7 +536,7 @@
}
DPRINTF(SBUS_ATTACH_DEBUG, ("sbus: devi=0x%p, softsp=0x%p\n",
- devi, softsp));
+ (void *)devi, (void *)softsp));
#ifdef notdef
/*
@@ -734,8 +734,8 @@
#undef REG_ADDR
DPRINTF(SBUS_REGISTERS_DEBUG, ("SYSIO Control reg: 0x%p\n"
- "SBUS Control reg: 0x%p", softsp->sysio_ctrl_reg,
- softsp->sbus_ctrl_reg));
+ "SBUS Control reg: 0x%p", (void *)softsp->sysio_ctrl_reg,
+ (void *)softsp->sbus_ctrl_reg));
#ifdef _STARFIRE
/* Setup interrupt target translation for starfire */
@@ -875,7 +875,7 @@
DPRINTF(SBUS_REGISTERS_DEBUG, ("Sbus slot 0x%x slot "
"configuration reg: 0x%p", (i > 3) ? i + 9 : i,
- config));
+ (void *)config));
}
} else {
/* Program the slot configuration registers */
@@ -1743,7 +1743,7 @@
intr_handler->inum = hdlp->ih_inum;
DPRINTF(SBUS_INTERRUPT_DEBUG, ("Add intr: xlated interrupt 0x%x "
- "intr_handler 0x%p\n", hdlp->ih_vector, intr_handler));
+ "intr_handler 0x%p\n", hdlp->ih_vector, (void *)intr_handler));
/*
* Grab this lock here. So it will protect the poll list.
@@ -1763,7 +1763,7 @@
#endif
DPRINTF(SBUS_INTERRUPT_DEBUG, ("Add intr:sbus_arg exists "
- "0x%p\n", sbus_arg));
+ "0x%p\n", (void *)sbus_arg));
/*
* Two bits per ino in the diagnostic register
* indicate the status of its interrupt.
@@ -1785,7 +1785,7 @@
sbus_arg->clear_reg = (softsp->clr_intr_reg +
ino_table[ino]->clear_reg);
DPRINTF(SBUS_INTERRUPT_DEBUG, ("Add intr:Ino 0x%x Interrupt "
- "clear reg: 0x%p\n", ino, sbus_arg->clear_reg));
+ "clear reg: 0x%p\n", ino, (void *)sbus_arg->clear_reg));
sbus_arg->softsp = softsp;
sbus_arg->handler_list = intr_handler;
@@ -1845,7 +1845,7 @@
sbus_arg->pil = hdlp->ih_pri;
DPRINTF(SBUS_INTERRUPT_DEBUG, ("Add intr:Alloc sbus_arg "
- "0x%p\n", sbus_arg));
+ "0x%p\n", (void *)sbus_arg));
}
softsp->intr_hndlr_cnt[slot]++;
@@ -1862,7 +1862,7 @@
tmp_mondo_vec |= INTERRUPT_VALID;
DPRINTF(SBUS_INTERRUPT_DEBUG, ("Add intr: Ino 0x%x mapping reg: 0x%p "
- "Intr cntr %d\n", ino, mondo_vec_reg,
+ "Intr cntr %d\n", ino, (void *)mondo_vec_reg,
softsp->intr_hndlr_cnt[slot]));
/* Force the interrupt state machine to idle. */
@@ -1976,8 +1976,9 @@
softsp->intr_hndlr_cnt[slot]--;
DPRINTF(SBUS_INTERRUPT_DEBUG, ("Rem intr: Softsp 0x%p, Mondo 0x%x, "
- "ino 0x%x, sbus_arg 0x%p intr cntr %d\n", softsp,
- hdlp->ih_vector, ino, sbus_arg, softsp->intr_hndlr_cnt[slot]));
+ "ino 0x%x, sbus_arg 0x%p intr cntr %d\n", (void *)softsp,
+ hdlp->ih_vector, ino, (void *)sbus_arg,
+ softsp->intr_hndlr_cnt[slot]));
ASSERT(sbus_arg != NULL);
ASSERT(sbus_arg->handler_list != NULL);
@@ -2010,7 +2011,7 @@
/* Free up the memory used for the sbus interrupt handler */
if (sbus_arg->handler_list == NULL) {
DPRINTF(SBUS_INTERRUPT_DEBUG, ("Rem intr: Freeing sbus arg "
- "0x%p\n", sbus_arg));
+ "0x%p\n", (void *)sbus_arg));
kmem_free(sbus_arg, sizeof (struct sbus_wrapper_arg));
softsp->intr_list[ino] = NULL;
}
--- a/usr/src/uts/sun4u/io/todds1287.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4u/io/todds1287.c Thu Jul 31 15:02:18 2008 -0700
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -178,8 +177,8 @@
static struct modldrv modldrv = {
&mod_driverops, /* Type of module. This one is a driver */
- "ds1287 clock driver %I%", /* Name of the module. */
- &ds1287_ops, /* driver ops */
+ "ds1287 clock driver", /* Name of the module. */
+ &ds1287_ops, /* driver ops */
};
static struct modlinkage modlinkage = {
@@ -318,7 +317,8 @@
}
softsp = ddi_get_soft_state(ds1287_state, instance);
- DPRINTF("ds1287_attach: instance=%d softsp=0x%p\n", instance, softsp);
+ DPRINTF("ds1287_attach: instance=%d softsp=0x%p\n", instance,
+ (void *)softsp);
softsp->dip = dip;
@@ -852,7 +852,7 @@
ret = tod_ops.tod_set_watchdog_timer(watchdog_timeout_seconds);
if (ret == 0)
cmn_err(CE_WARN, "ds1287: failed to set hardware "
- "watchdog timer.");
+ "watchdog timer.");
}
return (ts);
--- a/usr/src/uts/sun4u/os/cpr_impl.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4u/os/cpr_impl.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -1024,8 +1024,8 @@
if (descp >= i_cpr_storage_desc_end) {
CPR_DEBUG(CPR_DEBUG1, "ran out of descriptors, base 0x%p, "
"chunks %d, end 0x%p, descp 0x%p\n",
- i_cpr_storage_desc_base, chunks,
- i_cpr_storage_desc_end, descp);
+ (void *)i_cpr_storage_desc_base, chunks,
+ (void *)i_cpr_storage_desc_end, (void *)descp);
return (-1);
}
ASSERT(descp->csd_dirty_spfn == (uint_t)-1);
@@ -1196,7 +1196,7 @@
end = *endpp = descp + (len / (sizeof (**basepp)));
CPR_DEBUG(CPR_DEBUG7, "npages 0x%lx, len 0x%lx, items 0x%lx\n\t*basepp "
"%p, *endpp %p\n", npages, len, (len / (sizeof (**basepp))),
- *basepp, *endpp);
+ (void *)*basepp, (void *)*endpp);
i_cpr_storage_desc_init(descp, npages, end);
return (0);
}
@@ -1317,7 +1317,7 @@
/* Write cpr page descriptor */
error = cpr_write(vp, (caddr_t)&cpd, sizeof (cpd));
if (error) {
- CPR_DEBUG(CPR_DEBUG7, "descp: %p\n", descp);
+ CPR_DEBUG(CPR_DEBUG7, "descp: %p\n", (void *)descp);
#ifdef DEBUG
debug_enter("cpr_dump_sensitive: cpr_write() page "
"descriptor failed!\n");
@@ -1331,9 +1331,9 @@
error = cpr_write(vp, (caddr_t)datap, cpd.cpd_length);
if (error) {
CPR_DEBUG(CPR_DEBUG7, "error: %x\n", error);
- CPR_DEBUG(CPR_DEBUG7, "descp: %p\n", descp);
- CPR_DEBUG(CPR_DEBUG7, "cpr_write(%p, %p , %lx)\n", vp, datap,
- cpd.cpd_length);
+ CPR_DEBUG(CPR_DEBUG7, "descp: %p\n", (void *)descp);
+ CPR_DEBUG(CPR_DEBUG7, "cpr_write(%p, %p , %lx)\n",
+ (void *)vp, (void *)datap, cpd.cpd_length);
#ifdef DEBUG
debug_enter("cpr_dump_sensitive: cpr_write() data failed!\n");
#endif
--- a/usr/src/uts/sun4u/os/fillsysinfo.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4u/os/fillsysinfo.c Thu Jul 31 15:02:18 2008 -0700
@@ -337,7 +337,7 @@
*wkp->wk_vaddrp = (caddr_t)(uintptr_t)vaddr;
#ifdef VPRINTF
VPRINTF("fill_address: %s mapped to %p\n", namep,
- *wkp->wk_vaddrp);
+ (void *)*wkp->wk_vaddrp);
#endif /* VPRINTF */
}
if (wkp->wk_func != NULL)
--- a/usr/src/uts/sun4v/os/hsvc.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4v/os/hsvc.c Thu Jul 31 15:02:18 2008 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -183,18 +183,19 @@
mutex_enter(&hsvc_lock);
prom_printf("hsvc_dump: hsvc_groups: %p hsvc_avail: %p\n",
- hsvc_groups, hsvc_avail);
+ (void *)hsvc_groups, (void *)hsvc_avail);
for (hsvcp = hsvc_groups; hsvcp != NULL; hsvcp = hsvcp->next) {
prom_printf(" hsvcp: %p (0x%lx 0x%lx 0x%lx) ref: %ld clients: "
- "%p\n", hsvcp, hsvcp->group, hsvcp->major, hsvcp->minor,
- hsvcp->refcnt, hsvcp->clients);
+ "%p\n", (void *)hsvcp, hsvcp->group, hsvcp->major,
+ hsvcp->minor, hsvcp->refcnt, (void *)hsvcp->clients);
for (p = hsvcp->clients; p != NULL;
p = (hsvc_info_t *)p->hsvc_private) {
prom_printf(" client %p (0x%lx 0x%lx 0x%lx '%s') "
- "private: %p\n", p, p->hsvc_group, p->hsvc_major,
- p->hsvc_minor, p->hsvc_modname, p->hsvc_private);
+ "private: %p\n", (void *)p, p->hsvc_group,
+ p->hsvc_major, p->hsvc_minor, p->hsvc_modname,
+ p->hsvc_private);
}
}
@@ -222,7 +223,7 @@
hsvcp = kmem_zalloc(sizeof (hsvc_t), KM_SLEEP);
HSVC_DEBUG(DBG_HSVC_ALLOC,
("hsvc_alloc: hsvc_avail: %p kmem_zalloc hsvcp: %p\n",
- hsvc_avail, hsvcp));
+ (void *)hsvc_avail, (void *)hsvcp));
} else
hsvcp = NULL;
return (hsvcp);
@@ -241,7 +242,7 @@
} else {
HSVC_DEBUG(DBG_HSVC_ALLOC,
("hsvc_free: hsvc_avail: %p kmem_free hsvcp: %p\n",
- hsvc_avail, hsvcp));
+ (void *)hsvc_avail, (void *)hsvcp));
(void) kmem_free(hsvcp, sizeof (hsvc_t));
}
}
@@ -307,7 +308,7 @@
int status = 0;
HSVC_DEBUG(DBG_HSVC_REGISTER,
- ("hsvc_register %p (0x%lx 0x%lx 0x%lx ID %s)\n", hsvcinfop,
+ ("hsvc_register %p (0x%lx 0x%lx 0x%lx ID %s)\n", (void *)hsvcinfop,
api_group, major, minor, hsvcinfop->hsvc_modname));
if (hsvcinfop->hsvc_rev != HSVC_REV_1)
@@ -470,8 +471,8 @@
mutex_exit(&hsvc_lock);
HSVC_DEBUG(DBG_HSVC_REGISTER,
- ("hsvc_register(%p) status; %d sup_minor: 0x%lx\n", hsvcinfop,
- status, *supported_minor));
+ ("hsvc_register(%p) status; %d sup_minor: 0x%lx\n",
+ (void *)hsvcinfop, status, *supported_minor));
return (status);
}
@@ -495,7 +496,7 @@
HSVC_DEBUG(DBG_HSVC_UNREGISTER,
("hsvc_unregister %p (0x%lx 0x%lx 0x%lx ID %s)\n",
- hsvcinfop, api_group, major, hsvcinfop->hsvc_minor,
+ (void *)hsvcinfop, api_group, major, hsvcinfop->hsvc_minor,
hsvcinfop->hsvc_modname));
/*
@@ -555,7 +556,7 @@
mutex_exit(&hsvc_lock);
HSVC_DEBUG(DBG_HSVC_UNREGISTER,
- ("hsvc_unregister %p status: %d\n", hsvcinfop, status));
+ ("hsvc_unregister %p status: %d\n", (void *)hsvcinfop, status));
return (status);
}
--- a/usr/src/uts/sun4v/vm/mach_kpm.c Thu Jul 31 13:48:05 2008 -0700
+++ b/usr/src/uts/sun4v/vm/mach_kpm.c Thu Jul 31 15:02:18 2008 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -166,7 +166,8 @@
int
hat_kpm_fault(struct hat *hat, caddr_t vaddr)
{
- panic("pagefault in seg_kpm. hat: 0x%p vaddr: 0x%p", hat, vaddr);
+ panic("pagefault in seg_kpm. hat: 0x%p vaddr: 0x%p",
+ (void *)hat, (void *)vaddr);
return (0);
}