Re-adapt to the changed return types for major() and minor().

This commit is contained in:
he 2009-01-21 16:24:33 +00:00
parent d3baa5ffd2
commit d4b1297c8f
16 changed files with 64 additions and 64 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.313 2009/01/13 06:04:55 rtr Exp $ */
/* $NetBSD: machdep.c,v 1.314 2009/01/21 16:24:34 he Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.313 2009/01/13 06:04:55 rtr Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.314 2009/01/21 16:24:34 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1220,11 +1220,11 @@ dumpsys()
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
psize = (*bdev->d_psize)(dumpdev);

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.213 2009/01/11 22:51:36 mhitch Exp $ */
/* $NetBSD: machdep.c,v 1.214 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -85,7 +85,7 @@
#include "opt_panicbutton.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.213 2009/01/11 22:51:36 mhitch Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.214 2009/01/21 16:24:34 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -664,11 +664,11 @@ dumpsys()
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n", major(dumpdev),
printf("\ndump to dev %u,%u not possible\n", major(dumpdev),
minor(dumpdev));
return;
}
printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n", major(dumpdev),
printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev),
minor(dumpdev), dumplo);
psize = (*bdev->d_psize)(dumpdev);

View File

@ -1,4 +1,4 @@
/* $NetBSD: stubs.c,v 1.19 2009/01/11 23:27:47 cegger Exp $ */
/* $NetBSD: stubs.c,v 1.20 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: stubs.c,v 1.19 2009/01/11 23:27:47 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: stubs.c,v 1.20 2009/01/21 16:24:34 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -236,12 +236,12 @@ dodumpsys()
cpu_dumpconf();
}
if (dumplo <= 0 || dumpsize == 0) {
printf("\ndump to dev %"PRIu64",%"PRIu64" not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
delay(5000000);
return;
}
printf("\ndumping to dev %"PRIu64",%"PRIu64" offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.156 2009/01/17 05:22:00 tsutsui Exp $ */
/* $NetBSD: machdep.c,v 1.157 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.156 2009/01/17 05:22:00 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.157 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -530,11 +530,11 @@ dumpsys(void)
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64" ,%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
printf("\ndumping to dev %" PRIu64" ,%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
#if defined(DDB) || defined(PANICWAIT)

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.204 2009/01/11 13:03:00 tsutsui Exp $ */
/* $NetBSD: machdep.c,v 1.205 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.204 2009/01/11 13:03:00 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.205 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -869,14 +869,14 @@ dumpsys(void)
return;
}
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
dump = bdev->d_dump;
blkno = dumplo;
printf("\ndumping to dev %" PRIu64" ,%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
printf("dump ");

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.56 2009/01/15 12:35:13 rtr Exp $ */
/* $NetBSD: machdep.c,v 1.57 2009/01/21 16:24:34 he Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2009/01/15 12:35:13 rtr Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.57 2009/01/21 16:24:34 he Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@ -1608,11 +1608,11 @@ dumpsys(void)
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
psize = (*bdev->d_psize)(dumpdev);

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.61 2009/01/17 19:39:50 he Exp $ */
/* $NetBSD: machdep.c,v 1.62 2009/01/21 16:24:34 he Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.61 2009/01/17 19:39:50 he Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -615,14 +615,14 @@ dumpsys()
return;
}
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
dump = bdev->d_dump;
blkno = dumplo;
printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
printf("dump ");

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.326 2009/01/11 21:04:59 martin Exp $ */
/* $NetBSD: machdep.c,v 1.327 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.326 2009/01/11 21:04:59 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.327 2009/01/21 16:24:34 he Exp $");
#include "opt_adb.h"
#include "opt_ddb.h"
@ -777,14 +777,14 @@ dumpsys(void)
return;
}
if (dumplo <= 0) {
printf("\ndump to dev %"PRIu64",%"PRIu64" not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
dump = bdev->d_dump;
blkno = dumplo;
printf("\ndumping to dev %"PRIu64",%"PRIu64" offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
printf("dump ");

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.135 2009/01/17 19:38:52 he Exp $ */
/* $NetBSD: machdep.c,v 1.136 2009/01/21 16:24:33 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.135 2009/01/17 19:38:52 he Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.136 2009/01/21 16:24:33 he Exp $");
#include "opt_ddb.h"
#include "opt_m060sp.h"
@ -976,11 +976,11 @@ dumpsys(void)
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
psize = (*bdev->d_psize)(dumpdev);

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.78 2009/01/11 12:50:10 tsutsui Exp $ */
/* $NetBSD: machdep.c,v 1.79 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.78 2009/01/11 12:50:10 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.79 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -610,14 +610,14 @@ dumpsys(void)
return;
}
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
dump = bdev->d_dump;
blkno = dumplo;
printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
printf("dump ");

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.287 2009/01/12 08:12:46 cegger Exp $ */
/* $NetBSD: machdep.c,v 1.288 2009/01/21 16:24:34 he Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.287 2009/01/12 08:12:46 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.288 2009/01/21 16:24:34 he Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@ -1008,11 +1008,11 @@ dumpsys(void)
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %"PRIu64",%"PRIu64" not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
printf("\ndumping to dev %"PRIu64",%"PRIu64" offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
psize = (*bdev->d_psize)(dumpdev);

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.58 2009/01/12 08:22:37 cegger Exp $ */
/* $NetBSD: machdep.c,v 1.59 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -153,7 +153,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58 2009/01/12 08:22:37 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.59 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -687,7 +687,7 @@ dumpsys(void)
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %"PRIu64",%"PRIu64" not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
@ -699,7 +699,7 @@ dumpsys(void)
return;
}
printf("\ndumping to dev %"PRIu64",%"PRIu64" offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.190 2009/01/12 08:25:32 cegger Exp $ */
/* $NetBSD: machdep.c,v 1.191 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.190 2009/01/12 08:25:32 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.191 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -596,7 +596,7 @@ dumpsys(void)
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %"PRIu64",%"PRIu64" not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
@ -608,7 +608,7 @@ dumpsys(void)
return;
}
printf("\ndumping to dev %"PRIu64",%"PRIu64" offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.116 2009/01/12 17:17:38 tsutsui Exp $ */
/* $NetBSD: machdep.c,v 1.117 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.116 2009/01/12 17:17:38 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.117 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -621,7 +621,7 @@ dumpsys(void)
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
@ -633,7 +633,7 @@ dumpsys(void)
return;
}
printf("\ndumping to dev %" PRIu64 ",%" PRIu64" offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.172 2009/01/11 22:37:50 christos Exp $ */
/* $NetBSD: machdep.c,v 1.173 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.172 2009/01/11 22:37:50 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.173 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -427,11 +427,11 @@ dumpsys(void)
if (dumpsize == 0)
cpu_dumpconf();
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
printf("dump ");
switch ((*bdev->d_dump) (dumpdev, 0, 0, 0)) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.159 2009/01/18 02:40:05 isaki Exp $ */
/* $NetBSD: machdep.c,v 1.160 2009/01/21 16:24:34 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.159 2009/01/18 02:40:05 isaki Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.160 2009/01/21 16:24:34 he Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -717,14 +717,14 @@ dumpsys(void)
return;
}
if (dumplo <= 0) {
printf("\ndump to dev %" PRIu64 ",%" PRIu64 " not possible\n",
printf("\ndump to dev %u,%u not possible\n",
major(dumpdev), minor(dumpdev));
return;
}
dump = bdev->d_dump;
blkno = dumplo;
printf("\ndumping to dev %" PRIu64 ",%" PRIu64 " offset %ld\n",
printf("\ndumping to dev %u,%u offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
printf("dump ");