From 3ea8990ba9276efe1c2bbde129074f8dd9b8c992 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sat, 23 Mar 2013 16:08:30 +0000
Subject: Avoid using DEV_BSHIFT, and use DEV_BSIZE instead.

---
 sys/arch/hppa64/stand/libsa/pdc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sys/arch/hppa64')

diff --git a/sys/arch/hppa64/stand/libsa/pdc.c b/sys/arch/hppa64/stand/libsa/pdc.c
index 5ff24400bb8..252a0bd72bf 100644
--- a/sys/arch/hppa64/stand/libsa/pdc.c
+++ b/sys/arch/hppa64/stand/libsa/pdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdc.c,v 1.2 2011/03/13 00:13:52 deraadt Exp $	*/
+/*	$OpenBSD: pdc.c,v 1.3 2013/03/23 16:08:28 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -50,6 +50,7 @@
  *	Utah $Hdr: pdc.c 1.8 92/03/14$
  */
 
+#include <sys/param.h>
 #include <sys/time.h>
 #include "libsa.h"
 #include <sys/reboot.h>
@@ -59,7 +60,6 @@
 #include <machine/pdc.h>
 #include <machine/iomod.h>
 #include <machine/nvm.h>
-#include <machine/param.h>
 #include <machine/cpufunc.h>
 
 #include "dev_hppa64.h"
@@ -139,7 +139,7 @@ iodcstrategy(devdata, rw, blk, size, buf, rsize)
 #endif
 
 	blk += dp->fsoff;
-	blk <<= DEV_BSHIFT;
+	blk *= DEV_BSIZE;
 	if ((pzdev->pz_class & PCL_CLASS_MASK) == PCL_SEQU) {
 		/* rewind and re-read to seek */
 		if (blk < dp->last_blk) {
-- 
cgit v1.2.3