[SSI] openssi/kernel/cluster/ssi/clreg clreg_head.c,1.6,1.7
John Hughes <[email protected]> Tue, 16 Feb 2010 12:17:47 +0000
| Newsgroups | gmane.linux.cluster.ssic.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/clreg
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21065
Modified Files:
Tag: OPENSSI-DEBIAN
clreg_head.c
Log Message:
Don't use %x for addresses, use %p (works on lp64)
Index: clreg_head.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/clreg/clreg_head.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clreg_head.c 27 Oct 2009 03:18:29 -0000 1.6
+++ clreg_head.c 16 Feb 2010 12:17:44 -0000 1.7
@@ -479,21 +479,21 @@
printk(KERN_DEBUG "crh_name=%s\n", hp->crh_name);
printk(KERN_DEBUG "crh_type=%d\n", hp->crh_type);
printk(KERN_DEBUG "crh_depth=%d\n", hp->crh_depth);
- printk(KERN_DEBUG "crh_parent=0x%x\n", (unsigned int) hp->crh_parent);
- printk(KERN_DEBUG "crh_prev=0x%x\n", (unsigned int) hp->crh_prev);
- printk(KERN_DEBUG "crh_next=0x%x\n", (unsigned int) hp->crh_next);
+ printk(KERN_DEBUG "crh_parent=%p\n", hp->crh_parent);
+ printk(KERN_DEBUG "crh_prev=%p\n", hp->crh_prev);
+ printk(KERN_DEBUG "crh_next=%p\n", hp->crh_next);
if (hp->crh_type == CLREG_TYPE_ENTRY) {
clreg_entry_t *ep = CLREG_HEAD_TO_ENTRY(hp);
printk(KERN_DEBUG "cre_gennum=%d\n", ep->cre_gennum);
- printk(KERN_DEBUG "cre_update_func=0x%x\n",
- (unsigned int) ep->cre_update_func);
- printk(KERN_DEBUG "cre_update_arg=0x%x\n",
- (unsigned int) ep->cre_update_arg);
+ printk(KERN_DEBUG "cre_update_func=%p\n",
+ ep->cre_update_func);
+ printk(KERN_DEBUG "cre_update_arg=%p\n",
+ ep->cre_update_arg);
printk(KERN_DEBUG "cre_datalen=%d\n", ep->cre_datalen);
- printk(KERN_DEBUG "cre_data=0x%x\n",
- (unsigned int) ep->cre_data);
+ printk(KERN_DEBUG "cre_data=%p\n",
+ ep->cre_data);
}
else if (hp->crh_type == CLREG_TYPE_DOMAIN) {
clreg_domain_t *dp = CLREG_HEAD_TO_DOMAIN(hp);
@@ -501,8 +501,8 @@
printk(KERN_DEBUG "crd_hash_size=%d\n", dp->crd_hash_size);
for (i = 0; i < dp->crd_hash_size; i++)
- printk(KERN_DEBUG "crd_hash[%d]=0x%x\n", i,
- (unsigned int) dp->crd_hash[i]);
+ printk(KERN_DEBUG "crd_hash[%d]=%p\n", i,
+ dp->crd_hash[i]);
}
}
@@ -513,12 +513,12 @@
{
clreg_entry_t *ep = CLREG_HEAD_TO_ENTRY(hp);
- printk(KERN_DEBUG "%s: gennum=%d, update_func=0x%x\n",
+ printk(KERN_DEBUG "%s: gennum=%d, update_func=%p\n",
hp->crh_name, ep->cre_gennum,
- (unsigned int) ep->cre_update_func);
- printk(KERN_DEBUG "\tupdate_arg=0x%x, data=0x%x, datalen=%d\n",
- (unsigned int) ep->cre_update_arg,
- (unsigned int) ep->cre_data,
+ ep->cre_update_func);
+ printk(KERN_DEBUG "\tupdate_arg=%p, data=%p, datalen=%d\n",
+ ep->cre_update_arg,
+ ep->cre_data,
ep->cre_datalen);
return 0;
}
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev