Sun Jan 11 22:37:51 2009 UTC ()
fix dev_t printf formats.


(christos)
diff -r1.171 -r1.172 src/sys/arch/vax/vax/machdep.c
cvs diff -r1.171 -r1.172 src/sys/arch/vax/vax/machdep.c (expand / switch to unified diff)

--- src/sys/arch/vax/vax/machdep.c 2008/11/30 18:21:36 1.171
+++ src/sys/arch/vax/vax/machdep.c 2009/01/11 22:37:50 1.172
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: machdep.c,v 1.171 2008/11/30 18:21:36 martin Exp $ */ 1/* $NetBSD: machdep.c,v 1.172 2009/01/11 22:37:50 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. 4 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
5 * All rights reserved. 5 * All rights reserved.
6 *  6 *
7 * Changed for the VAX port (and for readability) /IC 7 * Changed for the VAX port (and for readability) /IC
8 *  8 *
9 * This code is derived from software contributed to Berkeley by the Systems 9 * This code is derived from software contributed to Berkeley by the Systems
10 * Programming Group of the University of Utah Computer Science Department. 10 * Programming Group of the University of Utah Computer Science Department.
11 *  11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -73,27 +73,27 @@ @@ -73,27 +73,27 @@
73 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 73 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
74 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 74 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
75 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 75 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
76 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 76 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
77 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 77 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
78 * SUCH DAMAGE. 78 * SUCH DAMAGE.
79 *  79 *
80 * from: Utah Hdr: machdep.c 1.63 91/04/24 80 * from: Utah Hdr: machdep.c 1.63 91/04/24
81 *  81 *
82 * @(#)machdep.c 7.16 (Berkeley) 6/3/91 82 * @(#)machdep.c 7.16 (Berkeley) 6/3/91
83 */ 83 */
84 84
85#include <sys/cdefs.h> 85#include <sys/cdefs.h>
86__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.171 2008/11/30 18:21:36 martin Exp $"); 86__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.172 2009/01/11 22:37:50 christos Exp $");
87 87
88#include "opt_ddb.h" 88#include "opt_ddb.h"
89#include "opt_compat_netbsd.h" 89#include "opt_compat_netbsd.h"
90#include "opt_compat_ultrix.h" 90#include "opt_compat_ultrix.h"
91#include "opt_multiprocessor.h" 91#include "opt_multiprocessor.h"
92#include "opt_lockdebug.h" 92#include "opt_lockdebug.h"
93#include "opt_compat_ibcs2.h" 93#include "opt_compat_ibcs2.h"
94 94
95#include <sys/param.h> 95#include <sys/param.h>
96#include <sys/systm.h> 96#include <sys/systm.h>
97#include <sys/extent.h> 97#include <sys/extent.h>
98#include <sys/proc.h> 98#include <sys/proc.h>
99#include <sys/user.h> 99#include <sys/user.h>
@@ -417,32 +417,32 @@ dumpsys(void) @@ -417,32 +417,32 @@ dumpsys(void)
417 417
418 if (dumpdev == NODEV) 418 if (dumpdev == NODEV)
419 return; 419 return;
420 bdev = bdevsw_lookup(dumpdev); 420 bdev = bdevsw_lookup(dumpdev);
421 if (bdev == NULL) 421 if (bdev == NULL)
422 return; 422 return;
423 /* 423 /*
424 * For dumps during autoconfiguration, if dump device has already 424 * For dumps during autoconfiguration, if dump device has already
425 * configured... 425 * configured...
426 */ 426 */
427 if (dumpsize == 0) 427 if (dumpsize == 0)
428 cpu_dumpconf(); 428 cpu_dumpconf();
429 if (dumplo <= 0) { 429 if (dumplo <= 0) {
430 printf("\ndump to dev %u,%u not possible\n", major(dumpdev), 430 printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
431 minor(dumpdev)); 431 major(dumpdev), minor(dumpdev));
432 return; 432 return;
433 } 433 }
434 printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev), 434 printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n",
435 minor(dumpdev), dumplo); 435 major(dumpdev), minor(dumpdev), dumplo);
436 printf("dump "); 436 printf("dump ");
437 switch ((*bdev->d_dump) (dumpdev, 0, 0, 0)) { 437 switch ((*bdev->d_dump) (dumpdev, 0, 0, 0)) {
438 438
439 case ENXIO: 439 case ENXIO:
440 printf("device bad\n"); 440 printf("device bad\n");
441 break; 441 break;
442 442
443 case EFAULT: 443 case EFAULT:
444 printf("device not ready\n"); 444 printf("device not ready\n");
445 break; 445 break;
446 446
447 case EINVAL: 447 case EINVAL:
448 printf("area improper\n"); 448 printf("area improper\n");