some trivial diffs for vax -current

[Brad Parker <brad%heeltoe.com@localhost>]

I've been trying to build -current for vax, but I think I'm going to give
up and focus on netbsd-5.

I can cleanly build netbsd-2, netbsd-4 and netbsd-5 branches for vax
from cvs.  But the trunk has a few issues which are a little more than I
can tackle right now.  I'm going to work on 11/730 diffs for the
netbsd-4 and netbsd-5 branches, since with any luck it will be easy
to merge the -5 changes back into trunk.

I did fix a few trivial things; dev_t seems to have gone long long.
below are some diffs for that:


--- ./arch/vax/vax/machdep.c.~1.171.~   2008-11-30 22:09:44.000000000 -0500
+++ ./arch/vax/vax/machdep.c    2009-01-12 13:48:42.000000000 -0500
@@ -427,12 +427,14 @@
        if (dumpsize == 0)
                cpu_dumpconf();
        if (dumplo <= 0) {
-               printf("\ndump to dev %u,%u not possible\n", major(dumpdev),
-                   minor(dumpdev));
+               printf("\ndump to dev %llu,%llu not possible\n",
+                   (unsigned long long)major(dumpdev),
+                   (unsigned long long)minor(dumpdev));
                return;
        }
-       printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev),
-           minor(dumpdev), dumplo);
+       printf("\ndumping to dev %llu,%llu offset %ld\n",
+           (unsigned long long)major(dumpdev),
+           (unsigned long long)minor(dumpdev), dumplo);
        printf("dump ");
        switch ((*bdev->d_dump) (dumpdev, 0, 0, 0)) {
 
--- ./dev/mscp/mscp_disk.c.~1.60.~      2008-06-12 23:07:47.000000000 -0400
+++ ./dev/mscp/mscp_disk.c      2009-01-12 13:49:33.000000000 -0500
@@ -984,8 +984,8 @@
                ra = device_lookup_private(&rx_cd, unit);
        else
 #endif
-               panic("rriodone: unexpected major %d unit %d",
-                   major(bp->b_dev), unit);
+               panic("rriodone: unexpected major %llu unit %d",
+                     (unsigned long long)major(bp->b_dev), unit);
        disk_unbusy(&ra->ra_disk, bp->b_bcount, (bp->b_flags & B_READ));
 
        biodone(bp);
--- ./dev/qbus/rf.c.~1.21.~     2008-07-25 23:03:24.000000000 -0400
+++ ./dev/qbus/rf.c     2009-01-12 13:52:39.000000000 -0500
@@ -576,7 +576,7 @@
            == 0)
                panic("rfstrategy: can not operate on non-open drive %s "
                    "partition %d", device_xname(rf_sc->sc_dev),
-                   DISKPART(buf->b_dev));
+                    (int)DISKPART(buf->b_dev));
        if (buf->b_bcount == 0) {
                biodone(buf);
                return;
@@ -1056,7 +1056,8 @@
 
        if ((rf_sc->sc_state & 1 << (DISKPART(dev) + RFS_OPEN_SHIFT)) == 0)
                panic("rfclose: can not close non-open drive %s "
-                   "partition %d", device_xname(rf_sc->sc_dev), DISKPART(dev));
+                   "partition %d", device_xname(rf_sc->sc_dev),
+                   (int)DISKPART(dev));
        else
                rf_sc->sc_state &= ~(1 << (DISKPART(dev) + RFS_OPEN_SHIFT));
        if ((rf_sc->sc_state & RFS_OPEN_MASK) == 0)
@@ -1092,7 +1093,8 @@
        /* We are going to operate on a non-open dev? PANIC! */
        if ((rf_sc->sc_state & 1 << (DISKPART(dev) + RFS_OPEN_SHIFT)) == 0)
                panic("rfioctl: can not operate on non-open drive %s "
-                   "partition %d", device_xname(rf_sc->sc_dev), DISKPART(dev));
+                   "partition %d", device_xname(rf_sc->sc_dev),
+                   (int)DISKPART(dev));
        switch (cmd) {
        /* get and set disklabel; DIOCGPART used internally */
        case DIOCGDINFO: /* get */