diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2014-07-22 17:26:04 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2014-07-22 17:26:04 +0000 |
| commit | 7f9ccaeed3de506c876dec981cbf4e55778a7c2c (patch) | |
| tree | 6e5e28b76157bd22cb41b51335bf6e160e69d73f /sys | |
| parent | 495cb63db8a231ce0d15d0bcd5ed87cad8b82d45 (diff) | |
- remove unneeded header
- move a declaration before code
- sync with wd.c -r1.101 from may 2011 and pass dk_openmask to setdisklabel
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/octeon/dev/octcf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c index 42e96a3da35..3150065face 100644 --- a/sys/arch/octeon/dev/octcf.c +++ b/sys/arch/octeon/dev/octcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octcf.c,v 1.22 2014/07/22 14:52:35 jasper Exp $ */ +/* $OpenBSD: octcf.c,v 1.23 2014/07/22 17:26:03 jasper Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -73,8 +73,6 @@ #include <sys/vnode.h> #include <sys/dkio.h> -#include <uvm/uvm_extern.h> - #include <machine/intr.h> #include <machine/bus.h> @@ -179,8 +177,8 @@ octcfattach(struct device *parent, struct device *self, void *aux) struct iobus_attach_args *aa = aux; int i, blank; char buf[41], c, *p, *q; - OCTCFDEBUG_PRINT(("%s\n", __func__), DEBUG_FUNCS | DEBUG_PROBE); uint8_t status; + OCTCFDEBUG_PRINT(("%s\n", __func__), DEBUG_FUNCS | DEBUG_PROBE); wd->sc_iot = aa->aa_bust; @@ -592,7 +590,7 @@ octcfioctl(dev_t dev, u_long xfer, caddr_t addr, int flag, struct proc *p) goto exit; error = setdisklabel(wd->sc_dk.dk_label, - (struct disklabel *)addr, /*wd->sc_dk.dk_openmask : */0); + (struct disklabel *)addr, wd->sc_dk.dk_openmask); if (error == 0) { if (xfer == DIOCWDINFO) error = writedisklabel(DISKLABELDEV(dev), |