CVS commit: src/sys/arch/sparc64/dev

[Takeshi Nakayama]

Module Name:    src
Committed By:   nakayama
Date:           Sat Aug 20 18:21:18 UTC 2016

Modified Files:
        src/sys/arch/sparc64/dev: ldc.c vdsk.c

Log Message:
Avoid "cast to pointer from integer of different size" warning on
32-bit kernels.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/ldc.c \
    src/sys/arch/sparc64/dev/vdsk.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/sparc64/dev/ldc.c
diff -u src/sys/arch/sparc64/dev/ldc.c:1.1 src/sys/arch/sparc64/dev/ldc.c:1.2
--- src/sys/arch/sparc64/dev/ldc.c:1.1	Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/ldc.c	Sat Aug 20 18:21:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldc.c,v 1.1 2016/08/19 19:02:07 palle Exp $	*/
+/*	$NetBSD: ldc.c,v 1.2 2016/08/20 18:21:18 nakayama Exp $	*/
 /*	$OpenBSD: ldc.c,v 1.12 2015/03/21 18:02:58 kettenis Exp $	*/
 /*
  * Copyright (c) 2009 Mark Kettenis
@@ -256,7 +256,7 @@ ldc_send_vers(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_INFO;
@@ -291,7 +291,7 @@ ldc_send_ack(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_ACK;
@@ -326,7 +326,7 @@ ldc_send_rts(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_INFO;
@@ -361,7 +361,7 @@ ldc_send_rtr(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_INFO;
@@ -396,7 +396,7 @@ ldc_send_rdx(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_INFO;
@@ -442,7 +442,7 @@ ldc_send_unreliable(struct ldc_conn *lc,
 	}
 
 	while (len > 0) {
-		lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+		lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 		bzero(lp, sizeof(struct ldc_pkt));
 		lp->type = LDC_DATA;
 		lp->stype = LDC_INFO;
Index: src/sys/arch/sparc64/dev/vdsk.c
diff -u src/sys/arch/sparc64/dev/vdsk.c:1.1 src/sys/arch/sparc64/dev/vdsk.c:1.2
--- src/sys/arch/sparc64/dev/vdsk.c:1.1	Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/vdsk.c	Sat Aug 20 18:21:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vdsk.c,v 1.1 2016/08/19 19:02:07 palle Exp $	*/
+/*	$NetBSD: vdsk.c,v 1.2 2016/08/20 18:21:18 nakayama Exp $	*/
 /*	$OpenBSD: vdsk.c,v 1.46 2015/01/25 21:42:13 kettenis Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Mark Kettenis
@@ -542,7 +542,7 @@ vdsk_rx_intr(void *arg)
 	if (rx_head == rx_tail)
 		return (0);
 
-	lp = (struct ldc_pkt *)(lc->lc_rxq->lq_va + rx_head);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_rxq->lq_va + rx_head);
 	switch (lp->type) {
 		case LDC_CTRL:
 			ldc_rx_ctrl(lc, lp);