patch-2.3.41 linux/drivers/fc4/socal.c

Next file: linux/drivers/i2o/i2o_core.c
Previous file: linux/drivers/fc4/soc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.40/linux/drivers/fc4/socal.c linux/drivers/fc4/socal.c
@@ -794,7 +794,7 @@
 	size = (SOCAL_CQ_REQ0_SIZE + SOCAL_CQ_REQ1_SIZE +
 		SOCAL_CQ_RSP0_SIZE + SOCAL_CQ_RSP1_SIZE +
 		SOCAL_CQ_RSP2_SIZE) * sizeof(socal_req);
-	s->req_cpu = sbus_alloc_consistant(sdev, size, &s->req_dvma);
+	s->req_cpu = sbus_alloc_consistent(sdev, size, &s->req_dvma);
 	s->req[0].pool = s->req_cpu;
 	cq[0].address = s->req_dvma;
 	s->req[1].pool = s->req[0].pool + SOCAL_CQ_REQ0_SIZE;
@@ -903,7 +903,7 @@
 			sbus_iounmap(s->xram, sdev->reg_addrs[1].reg_size);
 			sbus_iounmap(s->regs, sdev->reg_addrs[2].reg_size);
 		}
-		sbus_free_consistant(sdev,
+		sbus_free_consistent(sdev,
 				     (SOCAL_CQ_REQ0_SIZE + SOCAL_CQ_REQ1_SIZE +
 				      SOCAL_CQ_RSP0_SIZE + SOCAL_CQ_RSP1_SIZE +
 				      SOCAL_CQ_RSP2_SIZE) * sizeof(socal_req),

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)