[SSI] openssi/kernel/cluster/ssi/vproc dvp_pvpsops.c, 1.19, 1.20 nd_cleanup.c, 1.11, 1.12

John Hughes <[email protected]> Sat, 13 Feb 2010 14:57:56 +0000
Newsgroups gmane.linux.cluster.ssic.cvs
Message-ID <[email protected]>
Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/vproc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31045/cluster/ssi/vproc

Modified Files:
      Tag: OPENSSI-FC
	dvp_pvpsops.c nd_cleanup.c 
Log Message:
Fix warnings on lp64 systems

Index: dvp_pvpsops.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/vproc/dvp_pvpsops.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dvp_pvpsops.c	27 Oct 2009 03:18:29 -0000	1.19
+++ dvp_pvpsops.c	13 Feb 2010 14:57:54 -0000	1.20
@@ -864,7 +864,7 @@
 	/*
 	 * Reboot the root node.
 	 */
-	error = pps_reboot(flag1, (void *)flag2);
+	error = pps_reboot(flag1, (void *)(long)flag2);
 	if (flag1 == LINUX_REBOOT_CMD_HALT ||
 	    flag1 == LINUX_REBOOT_CMD_POWER_OFF) {
 #ifdef VPROC_REBOOT_SECONDARY_MASTER_NM_DISABLE
@@ -909,7 +909,7 @@
 		nm_stop();
 		stop_all_ics();
 	}
-	pps_reboot(flag1, (void *)flag2);
+	pps_reboot(flag1, (void *)(long)flag2);
 	/* Don't do_exit() for HALT/POWER_OFF since we are in server proc */
 	return 0;
 }

Index: nd_cleanup.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/vproc/nd_cleanup.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- nd_cleanup.c	17 Dec 2009 05:46:50 -0000	1.11
+++ nd_cleanup.c	13 Feb 2010 14:57:54 -0000	1.12
@@ -149,7 +149,7 @@
 {
 	struct vproc *vp;
 	struct pvproc *pvp;
-	clusternode_t down_node = (clusternode_t)args;
+	clusternode_t down_node = (long)args;
 	boolean_t pack;
 
 	SSI_ASSERT(!(vcdp->vcd_flags & VPROC_CARE_MEMBER_LIST));


------------------------------------------------------------------------------
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