Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not call setroot() from MD code and from MI code, which has 

unwanted sideeffects in the RB_ASKNAME case. This fixes PR/46732.

No longer wrap MD cpu_rootconf(), as hp300 port stores reboot information
as a side effect. Instead call MI rootconf() from MD code which makes
rootconf() now a wrapper to setroot().

Adjust several MD routines to set the global booted_device,booted_partition
variables instead of passing partial information to setroot().

Make cpu_rootconf(9) describe the calling order.
This commit is contained in:
mlelstv 2012-07-29 18:05:39 +00:00
parent 160cd430cb
commit 8ce4433821
72 changed files with 270 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
share/man/man9/cpu_rootconf.9
View File

@ -1,4 +1,4 @@
.\" $NetBSD: cpu_rootconf.9,v 1.6 2010/04/13 07:32:31 jruoho Exp $
.\" $NetBSD: cpu_rootconf.9,v 1.7 2012/07/29 18:05:48 mlelstv Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -32,6 +32,7 @@
.Os
.Sh NAME
.Nm cpu_rootconf ,
.Nm rootconf ,
.Nm setroot
.Nd root file system setup
.Sh SYNOPSIS
@ -40,6 +41,8 @@
.Ft void
.Fn cpu_rootconf "void"
.Ft void
.Fn rootconf "void"
.Ft void
.Fn setroot "device_t bootdv" "int bootpartition"
.Sh DESCRIPTION
The
@ -47,16 +50,33 @@ The
is a machine-dependent interface invoked during system bootstrap to
determine the root file system device and initialize machine-dependent
file system state.
.Pp
The
.Fn cpu_rootconf
function invokes the machine-independent
.Fn setroot
function to record the boot/root device
.Fa bootdv
and the boot partition information
.Fa bootpartition
provides the global variables
.Fa booted_device,
.Fa booted_partition ,
.Fa booted_startblk
and
.Fa booted_nblks
and invokes the machine-independent function
.Fa rootconf
which
.Fa rootconf
then calls the function
.Fa setroot
to record the boot/root device and the boot partition information
for use in machine-independent code.
.Pp
For disk boot, if
.Fa booted_nblks
is not 0, then
.Fa booted_startblk
and
.Fa booted_nblks
are supposed to specify a disk wedge that is used as the root device.
Otherwise the
.Fa booted_partition
is used.
.Sh SEE ALSO
.Xr boot 8 ,
.Xr boothowto 9
.Xr boothowto 9 ,
.Xr dk 4

7
sys/arch/acorn26/acorn26/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.8 2011/12/17 14:51:07 kiyohara Exp $ */
/* $NetBSD: autoconf.c,v 1.9 2012/07/29 18:05:39 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 1999 Ben Harris
* All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2011/12/17 14:51:07 kiyohara Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2012/07/29 18:05:39 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -57,8 +57,7 @@ void
cpu_rootconf(void)
{
/* XXX This could actually do something */
setroot(NULL, 0);
rootconf();
}
void

6
sys/arch/acorn32/acorn32/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.17 2011/06/03 07:35:37 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:39 mlelstv Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2011/06/03 07:35:37 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:39 mlelstv Exp $");
#include "opt_md.h"
@ -137,7 +137,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device != NULL ? device_xname(booted_device) : "<unknown>");
#endif
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/algor/algor/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.20 2011/07/09 16:03:00 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:39 mlelstv Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2011/07/09 16:03:00 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:39 mlelstv Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@ -77,7 +77,7 @@ void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
#if defined(ALGOR_P4032)

6
sys/arch/alpha/alpha/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.51 2012/02/06 02:14:10 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.52 2012/07/29 18:05:39 mlelstv Exp $ */
/*
* Copyright (c) 1992, 1993
@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.51 2012/02/06 02:14:10 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.52 2012/07/29 18:05:39 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -100,7 +100,7 @@ cpu_rootconf(void)
if (booted_device == NULL)
printf("WARNING: can't figure what device matches \"%s\"\n",
bootinfo.booted_dev);
setroot(booted_device, booted_partition);
rootconf();
}
void

9
sys/arch/amiga/amiga/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.112 2012/07/13 08:47:07 rkujawa Exp $ */
/* $NetBSD: autoconf.c,v 1.113 2012/07/29 18:05:39 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.112 2012/07/13 08:47:07 rkujawa Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.113 2012/07/29 18:05:39 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -127,10 +127,7 @@ cpu_rootconf(void)
#ifdef DEBUG_KERNEL_START
printf("survived findroot()\n");
#endif
setroot(booted_device, booted_partition);
#ifdef DEBUG_KERNEL_START
printf("survived setroot()\n");
#endif
rootconf();
}
/*ARGSUSED*/

9
sys/arch/amigappc/amigappc/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.4 2011/06/18 08:08:27 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:39 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2011/06/18 08:08:27 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:39 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -91,10 +91,7 @@ cpu_rootconf(void)
#ifdef DEBUG_KERNEL_START
printf("survived findroot()\n");
#endif
setroot(booted_device, booted_partition);
#ifdef DEBUG_KERNEL_START
printf("survived setroot()\n");
#endif
rootconf();
}
/*ARGSUSED*/

7
sys/arch/arc/arc/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.33 2011/02/20 07:52:42 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.34 2012/07/29 18:05:39 mlelstv Exp $ */
/* $OpenBSD: autoconf.c,v 1.9 1997/05/18 13:45:20 pefo Exp $ */
/*
@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.33 2011/02/20 07:52:42 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.34 2012/07/29 18:05:39 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -166,7 +166,8 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_device ? bootdev_data->partition : 0);
booted_partition = booted_device ? bootdev_data->partition : 0;
rootconf();
}
struct devmap {

6
sys/arch/atari/atari/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.62 2012/06/30 10:37:00 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.63 2012/07/29 18:05:40 mlelstv Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.62 2012/06/30 10:37:00 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.63 2012/07/29 18:05:40 mlelstv Exp $");
#include "opt_md.h"
@ -119,7 +119,7 @@ cpu_rootconf(void)
}
}
#endif
setroot(booted_device, booted_partition);
rootconf();
}
/*ARGSUSED*/

6
sys/arch/bebox/bebox/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.24 2011/06/18 08:08:27 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.25 2012/07/29 18:05:40 mlelstv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2011/06/18 08:08:27 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2012/07/29 18:05:40 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -100,7 +100,7 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
/*

6
sys/arch/cats/cats/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.16 2009/03/18 10:22:27 cegger Exp $ */
/* $NetBSD: autoconf.c,v 1.17 2012/07/29 18:05:40 mlelstv Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2009/03/18 10:22:27 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2012/07/29 18:05:40 mlelstv Exp $");
#include "opt_md.h"
@ -121,7 +121,7 @@ cpu_rootconf(void)
set_root_device();
printf("boot device: %s\n",
booted_device != NULL ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/cesfic/cesfic/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.25 2011/06/06 16:52:18 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.26 2012/07/29 18:05:40 mlelstv Exp $ */
/*
* Copyright (c) 1997, 1999
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2011/06/06 16:52:18 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.26 2012/07/29 18:05:40 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -151,5 +151,5 @@ cpu_configure(void)
void
cpu_rootconf(void)
{
setroot(0, 0);
rootconf();
}

6
sys/arch/cobalt/cobalt/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.29 2011/07/09 16:09:01 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.30 2012/07/29 18:05:40 mlelstv Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2011/07/09 16:09:01 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.30 2012/07/29 18:05:40 mlelstv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -70,7 +70,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/dreamcast/dreamcast/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.9 2008/04/28 20:23:16 martin Exp $ */
/* $NetBSD: autoconf.c,v 1.10 2012/07/29 18:05:40 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2008/04/28 20:23:16 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2012/07/29 18:05:40 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -52,5 +52,5 @@ cpu_rootconf(void)
{
/* No boot information */
setroot(0, 0);
rootconf();
}

6
sys/arch/emips/emips/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.5 2011/06/12 03:21:21 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:47 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2011/06/12 03:21:21 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:47 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -142,7 +142,7 @@ cpu_rootconf(void)
booted_device ? device_xname(booted_device) : "<unknown>",
booted_partition);
setroot(booted_device, booted_partition);
rootconf();
}
/*

6
sys/arch/evbarm/evbarm/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.12 2008/04/28 20:23:16 martin Exp $ */
/* $NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:41 mlelstv Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2008/04/28 20:23:16 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:41 mlelstv Exp $");
#include "opt_md.h"
@ -56,7 +56,7 @@ cpu_rootconf(void)
{
aprint_normal("boot device: %s\n",
booted_device != NULL ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/evbmips/adm5120/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.4 2010/01/22 08:56:05 martin Exp $ */
/* $NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:41 mlelstv Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2010/01/22 08:56:05 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:41 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -90,7 +90,7 @@ void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/evbmips/alchemy/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.17 2010/01/22 08:56:05 martin Exp $ */
/* $NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:41 mlelstv Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2010/01/22 08:56:05 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:41 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -74,7 +74,7 @@ void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/evbmips/atheros/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.10 2011/07/07 05:06:44 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.11 2012/07/29 18:05:41 mlelstv Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2011/07/07 05:06:44 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2012/07/29 18:05:41 mlelstv Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -67,7 +67,7 @@ void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/evbmips/gdium/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.4 2011/07/22 20:41:57 macallan Exp $ */
/* $NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:41 mlelstv Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2011/07/22 20:41:57 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:41 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -74,7 +74,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
extern char bootstring[];

6
sys/arch/evbmips/loongson/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.2 2012/03/02 13:20:57 nonaka Exp $ */
/* $NetBSD: autoconf.c,v 1.3 2012/07/29 18:05:41 mlelstv Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.2 2012/03/02 13:20:57 nonaka Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2012/07/29 18:05:41 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -77,7 +77,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
extern char bootstring[];

6
sys/arch/evbmips/malta/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.15 2009/11/05 00:35:43 dyoung Exp $ */
/* $NetBSD: autoconf.c,v 1.16 2012/07/29 18:05:41 mlelstv Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2009/11/05 00:35:43 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2012/07/29 18:05:41 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -74,7 +74,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
extern char bootstring[];

6
sys/arch/evbmips/rasoc/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.2 2011/07/28 15:50:13 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.3 2012/07/29 18:05:42 mlelstv Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.2 2011/07/28 15:50:13 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2012/07/29 18:05:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -58,7 +58,7 @@ cpu_configure(void)
void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/evbmips/rmixl/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.5 2012/02/12 16:34:08 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:41 mlelstv Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2012/02/12 16:34:08 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:41 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -74,7 +74,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
extern char bootstring[];

6
sys/arch/evbppc/ev64260/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.16 2011/06/18 08:08:27 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.17 2012/07/29 18:05:42 mlelstv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2011/06/18 08:08:27 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2012/07/29 18:05:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -88,7 +88,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
dev_t bootdev = 0;

6
sys/arch/evbppc/explora/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.12 2011/12/12 11:23:57 kiyohara Exp $ */
/* $NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:42 mlelstv Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2011/12/12 11:23:57 kiyohara Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -57,7 +57,7 @@ cpu_configure(void)
void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/evbppc/mpc85xx/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.5 2011/06/24 23:54:37 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:42 mlelstv Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2011/06/24 23:54:37 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:42 mlelstv Exp $");
#define __INTR_PRIVATE
@ -75,7 +75,7 @@ void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/evbppc/obs405/obs405_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obs405_autoconf.c,v 1.5 2011/06/18 06:44:26 matt Exp $ */
/* $NetBSD: obs405_autoconf.c,v 1.6 2012/07/29 18:05:42 mlelstv Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: obs405_autoconf.c,v 1.5 2011/06/18 06:44:26 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: obs405_autoconf.c,v 1.6 2012/07/29 18:05:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -51,7 +51,7 @@ void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/evbppc/pmppc/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.6 2011/06/18 06:44:27 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.7 2012/07/29 18:05:42 mlelstv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2011/06/18 06:44:27 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.7 2012/07/29 18:05:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -81,7 +81,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
u_long bootdev = 0; /* should be dev_t, but not until 32 bits */

6
sys/arch/evbppc/virtex/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.4 2011/12/12 11:23:57 kiyohara Exp $ */
/* $NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:42 mlelstv Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2011/12/12 11:23:57 kiyohara Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -102,5 +102,5 @@ cpu_configure(void)
void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/evbppc/walnut/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.20 2011/12/12 11:23:57 kiyohara Exp $ */
/* $NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:42 mlelstv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2011/12/12 11:23:57 kiyohara Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -82,7 +82,7 @@ void
cpu_rootconf(void)
{
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/evbsh3/evbsh3/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.10 2010/04/06 15:54:30 nonaka Exp $ */
/* $NetBSD: autoconf.c,v 1.11 2012/07/29 18:05:42 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2010/04/06 15:54:30 nonaka Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2012/07/29 18:05:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -57,5 +57,5 @@ cpu_rootconf(void)
{
/* No boot information */
setroot(0, 0);
rootconf();
}

11
sys/arch/ews4800mips/ews4800mips/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.8 2011/02/20 07:55:20 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.9 2012/07/29 18:05:43 mlelstv Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2011/02/20 07:55:20 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2012/07/29 18:05:43 mlelstv Exp $");
#include "opt_sbd.h"
@ -112,7 +112,8 @@ cpu_rootconf(void)
if (bootdev_name &&
(dv = device_find_by_xname(bootdev_name)) != NULL) {
setroot(dv, partition);
} else
setroot(0, 0);
booted_device = dv;
booted_partition = partition;
}
rootconf();
}

10
sys/arch/hp300/hp300/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.99 2012/01/27 18:52:55 para Exp $ */
/* $NetBSD: autoconf.c,v 1.100 2012/07/29 18:05:43 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.99 2012/01/27 18:52:55 para Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.100 2012/07/29 18:05:43 mlelstv Exp $");
#include "dvbox.h"
#include "gbox.h"
@ -324,8 +324,6 @@ cpu_rootconf(void)
}
}
dv = booted_device;
/*
* If wild carded root device and wired down NFS root file system,
* pick the network interface device to use.
@ -338,7 +336,7 @@ cpu_rootconf(void)
dd != NULL; dd = LIST_NEXT(dd, dd_list)) {
if (device_class(dd->dd_dev) == DV_IFNET) {
/* Got it! */
dv = dd->dd_dev;
booted_device = dd->dd_dev;
break;
}
}
@ -363,7 +361,7 @@ cpu_rootconf(void)
if (booted_device != NULL && device_class(booted_device) == DV_TAPE)
boothowto |= RB_ASKNAME;
setroot(dv, booted_partition);
rootconf();
/*
* Set bootdev based on what we found as the root.

7
sys/arch/hp700/hp700/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.47 2012/05/23 16:11:37 skrll Exp $ */
/* $NetBSD: autoconf.c,v 1.48 2012/07/29 18:05:40 mlelstv Exp $ */
/* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */
@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.47 2012/05/23 16:11:37 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.48 2012/07/29 18:05:40 mlelstv Exp $");
#include "opt_kgdb.h"
#include "opt_useleds.h"
@ -475,7 +475,8 @@ cpu_rootconf(void)
if (boot_device != NULL)
printf("boot device: %s\n", boot_device->dv_xname );
setroot(boot_device, 0);
booted_device = boot_device;
rootconf();
}

6
sys/arch/hpcarm/hpcarm/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.19 2011/06/21 15:28:05 kiyohara Exp $ */
/* $NetBSD: autoconf.c,v 1.20 2012/07/29 18:05:43 mlelstv Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2011/06/21 15:28:05 kiyohara Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2012/07/29 18:05:43 mlelstv Exp $");
#include "opt_md.h"
@ -129,7 +129,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device != NULL ? booted_device->dv_xname : "<unknown>");
#endif
setroot(booted_device, booted_partition);
rootconf();
}

8
sys/arch/hpcmips/hpcmips/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.24 2011/02/20 07:58:13 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.25 2012/07/29 18:05:43 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,11 +39,11 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2011/02/20 07:58:13 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2012/07/29 18:05:43 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h> /* setroot() */
#include <sys/conf.h>
#include <sys/device.h>
#include <machine/disklabel.h>
@ -88,7 +88,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/hpcsh/hpcsh/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.25 2011/07/19 15:30:53 dyoung Exp $ */
/* $NetBSD: autoconf.c,v 1.26 2012/07/29 18:05:43 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2011/07/19 15:30:53 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.26 2012/07/29 18:05:43 mlelstv Exp $");
#include "opt_md.h"
@ -102,7 +102,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
#endif
setroot(booted_device, booted_partition);
rootconf();
}
void

4
sys/arch/ia64/ia64/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.5 2009/07/20 04:41:36 kiyohara Exp $ */
/* $NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:43 mlelstv Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@ cpu_rootconf(void)
{
if (booted_device == NULL) /* XXX: Platform support. Match to boot device. */
printf("WARNING: can't figure what device matches \"%s\"\n", "XXX");
setroot(booted_device, booted_partition);
rootconf();
}

4
sys/arch/ibmnws/ibmnws/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.11 2011/06/18 08:08:28 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.12 2012/07/29 18:05:43 mlelstv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -83,7 +83,7 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
u_long bootdev = 0; /* should be dev_t, but not until 32 bits */

6
sys/arch/iyonix/iyonix/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.13 2012/07/29 00:07:06 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.14 2012/07/29 18:05:44 mlelstv Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2012/07/29 00:07:06 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2012/07/29 18:05:44 mlelstv Exp $");
#include "opt_md.h"
@ -63,7 +63,7 @@ cpu_rootconf(void)
{
aprint_normal("boot device: %s\n",
booted_device != NULL ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/landisk/landisk/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.5 2009/11/05 18:15:17 dyoung Exp $ */
/* $NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:44 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2009/11/05 18:15:17 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2012/07/29 18:05:44 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -205,5 +205,5 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/luna68k/luna68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.12 2009/03/18 10:22:31 cegger Exp $ */
/* $NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:44 mlelstv 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: autoconf.c,v 1.12 2009/03/18 10:22:31 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:44 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -87,5 +87,5 @@ cpu_rootconf(void)
printf("boot device: %s\n",
(booted_device) ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, 0); /* XXX partition 'a' XXX */
rootconf();
}

6
sys/arch/mac68k/mac68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.72 2008/06/13 10:01:32 cegger Exp $ */
/* $NetBSD: autoconf.c,v 1.73 2012/07/29 18:05:44 mlelstv Exp $ */
/*
* Copyright (c) 1992, 1993
@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.72 2008/06/13 10:01:32 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.73 2012/07/29 18:05:44 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -102,7 +102,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
/*

6
sys/arch/mipsco/mipsco/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.24 2011/02/20 07:56:16 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.25 2012/07/29 18:05:44 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -48,7 +48,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2011/02/20 07:56:16 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2012/07/29 18:05:44 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -106,7 +106,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
dev_t bootdev = 0;

6
sys/arch/mmeye/mmeye/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.8 2011/02/19 10:46:28 kiyohara Exp $ */
/* $NetBSD: autoconf.c,v 1.9 2012/07/29 18:05:44 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2011/02/19 10:46:28 kiyohara Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2012/07/29 18:05:44 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -72,7 +72,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
void

7
sys/arch/mvme68k/mvme68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.45 2011/02/08 20:20:20 rmind Exp $ */
/* $NetBSD: autoconf.c,v 1.46 2012/07/29 18:05:44 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.45 2011/02/08 20:20:20 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.46 2012/07/29 18:05:44 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -102,7 +102,8 @@ cpu_rootconf(void)
else
printf("\n");
setroot(booted_device, bootpart);
booted_partition = bootpart;
rootconf();
}
void

6
sys/arch/mvmeppc/mvmeppc/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.12 2011/06/18 08:08:29 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:44 mlelstv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2011/06/18 08:08:29 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:44 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -80,7 +80,7 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
u_long bootdev = 0; /* should be dev_t, but not until 32 bits */

6
sys/arch/netwinder/netwinder/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.10 2007/12/03 15:34:01 ad Exp $ */
/* $NetBSD: autoconf.c,v 1.11 2012/07/29 18:05:45 mlelstv Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2007/12/03 15:34:01 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2012/07/29 18:05:45 mlelstv Exp $");
#include "opt_md.h"
@ -72,7 +72,7 @@ cpu_rootconf(void)
{
printf("boot device: %s\n",
booted_device != NULL ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/news68k/news68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.20 2011/05/10 14:41:55 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:45 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2011/05/10 14:41:55 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:45 mlelstv Exp $");
#include "scsibus.h"
@ -112,7 +112,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
u_long bootdev = 0; /* should be dev_t, but not until 32 bits */

6
sys/arch/newsmips/newsmips/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.35 2011/03/09 13:21:36 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.36 2012/07/29 18:05:45 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -49,7 +49,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.35 2011/03/09 13:21:36 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.36 2012/07/29 18:05:45 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -115,7 +115,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
u_long bootdev = 0; /* should be dev_t, but not until 32 bits */

6
sys/arch/next68k/next68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.25 2011/05/10 14:45:28 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.26 2012/07/29 18:05:45 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2011/05/10 14:45:28 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.26 2012/07/29 18:05:45 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -144,7 +144,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
(booted_device) ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, part);
rootconf();
}
/*

6
sys/arch/pmax/pmax/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.78 2011/07/09 17:32:30 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.79 2012/07/29 18:05:45 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.78 2011/07/09 17:32:30 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.79 2012/07/29 18:05:45 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -151,7 +151,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
/*

6
sys/arch/powerpc/oea/ofw_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofw_autoconf.c,v 1.16 2012/05/24 00:40:11 macallan Exp $ */
/* $NetBSD: ofw_autoconf.c,v 1.17 2012/07/29 18:05:45 mlelstv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.16 2012/05/24 00:40:11 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.17 2012/07/29 18:05:45 mlelstv Exp $");
#ifdef ofppc
#include "gtpci.h"
@ -484,7 +484,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
/*

6
sys/arch/prep/prep/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.24 2011/06/18 08:08:30 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.25 2012/07/29 18:05:45 mlelstv Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2011/06/18 08:08:30 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2012/07/29 18:05:45 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -87,7 +87,7 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
/*

6
sys/arch/rs6000/rs6000/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.3 2011/06/18 08:08:30 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.4 2012/07/29 18:05:47 mlelstv Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2011/06/18 08:08:30 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2012/07/29 18:05:47 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -78,5 +78,5 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/sandpoint/sandpoint/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.26 2012/07/28 23:11:01 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.27 2012/07/29 18:05:45 mlelstv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.26 2012/07/28 23:11:01 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.27 2012/07/29 18:05:45 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -101,7 +101,7 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/sbmips/sbmips/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.7 2011/02/20 07:47:38 matt Exp $ */
/* $NetBSD: autoconf.c,v 1.8 2012/07/29 18:05:46 mlelstv Exp $ */
/*
* Copyright 2000, 2001
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.7 2011/02/20 07:47:38 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2012/07/29 18:05:46 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -63,7 +63,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/sgimips/sgimips/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.42 2009/03/18 10:22:35 cegger Exp $ */
/* $NetBSD: autoconf.c,v 1.43 2012/07/29 18:05:46 mlelstv Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.42 2009/03/18 10:22:35 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.43 2012/07/29 18:05:46 mlelstv Exp $");
#include "opt_ddb.h"
@ -163,7 +163,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? booted_device->dv_xname : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
/*

6
sys/arch/shark/shark/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.17 2009/03/18 10:22:36 cegger Exp $ */
/* $NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:46 mlelstv Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2009/03/18 10:22:36 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:46 mlelstv Exp $");
#include "opt_md.h"
@ -148,7 +148,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device != NULL ? booted_device->dv_xname : "<unknown>");
#endif
setroot(booted_device, booted_partition);
rootconf();
}

14
sys/arch/sparc/sparc/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.243 2012/05/28 19:24:29 martin Exp $ */
/* $NetBSD: autoconf.c,v 1.244 2012/07/29 18:05:46 mlelstv Exp $ */
/*
* Copyright (c) 1996
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.243 2012/05/28 19:24:29 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.244 2012/07/29 18:05:46 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -1000,17 +1000,15 @@ void
cpu_rootconf(void)
{
struct bootpath *bp;
int bootpartition;
bp = nbootpath == 0 ? NULL : &bootpath[nbootpath-1];
if (bp == NULL)
bootpartition = 0;
booted_partition = 0;
else if (booted_device != bp->dev)
bootpartition = 0;
booted_partition = 0;
else
bootpartition = bp->val[2];
setroot(booted_device, bootpartition);
booted_partition = bp->val[2];
rootconf();
}
/*

8
sys/arch/sparc64/sparc64/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.187 2012/06/10 17:05:18 mlelstv Exp $ */
/* $NetBSD: autoconf.c,v 1.188 2012/07/29 18:05:46 mlelstv Exp $ */
/*
* Copyright (c) 1996
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.187 2012/06/10 17:05:18 mlelstv Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.188 2012/07/29 18:05:46 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -504,11 +504,9 @@ cpu_rootconf(void)
if (booted_device == NULL) {
printf("FATAL: boot device not found, check your firmware "
"settings!\n");
setroot(NULL, 0);
return;
}
setroot(booted_device, booted_partition);
rootconf();
}
char *

22
sys/arch/sun3/sun3/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.75 2008/04/28 20:23:38 martin Exp $ */
/* $NetBSD: autoconf.c,v 1.76 2012/07/29 18:05:46 mlelstv Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.75 2008/04/28 20:23:38 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.76 2012/07/29 18:05:46 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -185,8 +185,6 @@ cpu_rootconf(void)
{
struct bootparam *bp;
struct prom_n2f *nf;
struct device *boot_device;
int boot_partition;
const char *devname;
findfunc_t find;
char promname[4];
@ -205,8 +203,8 @@ cpu_rootconf(void)
promname[2] = '\0';
/* Default to "unknown" */
boot_device = NULL;
boot_partition = 0;
booted_device = NULL;
booted_partition = 0;
devname = "<unknown>";
partname[0] = '\0';
find = NULL;
@ -218,18 +216,18 @@ cpu_rootconf(void)
break;
}
if (find)
boot_device = (*find)(promname, bp->ctlrNum, bp->unitNum);
booted_device = (*find)(promname, bp->ctlrNum, bp->unitNum);
if (boot_device) {
devname = boot_device->dv_xname;
if (device_class(boot_device) == DV_DISK) {
boot_partition = bp->partNum & 7;
partname[0] = 'a' + boot_partition;
devname = booted_device->dv_xname;
if (device_class(booted_device) == DV_DISK) {
booted_partition = bp->partNum & 7;
partname[0] = 'a' + booted_partition;
partname[1] = '\0';
}
}
printf("boot device: %s%s\n", devname, partname);
setroot(boot_device, boot_partition);
rootconf();
}
/*

24
sys/arch/sun68k/sun68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.28 2008/07/01 15:15:34 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.29 2012/07/29 18:05:46 mlelstv Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28 2008/07/01 15:15:34 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2012/07/29 18:05:46 mlelstv Exp $");
#include "opt_kgdb.h"
@ -313,8 +313,6 @@ void
cpu_rootconf(void)
{
struct prom_n2f *nf;
device_t boot_device;
int boot_partition;
const char *devname;
findfunc_t find;
char promname[4];
@ -336,8 +334,8 @@ cpu_rootconf(void)
(void)str2hex(++prompath, &prom_part);
/* Default to "unknown" */
boot_device = NULL;
boot_partition = 0;
booted_device = NULL;
booted_partition = 0;
devname = "<unknown>";
partname[0] = '\0';
find = NULL;
@ -349,18 +347,18 @@ cpu_rootconf(void)
break;
}
if (find)
boot_device = (*find)(promname, prom_ctlr, prom_unit);
if (boot_device) {
devname = boot_device->dv_xname;
if (device_class(boot_device) == DV_DISK) {
boot_partition = prom_part & 7;
partname[0] = 'a' + boot_partition;
booted_device = (*find)(promname, prom_ctlr, prom_unit);
if (booted_device) {
devname = booted_device->dv_xname;
if (device_class(booted_device) == DV_DISK) {
booted_partition = prom_part & 7;
partname[0] = 'a' + booted_partition;
partname[1] = '\0';
}
}
printf("boot device: %s%s\n", devname, partname);
setroot(boot_device, boot_partition);
rootconf();
}
/*

7
sys/arch/usermode/dev/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.71 2012/06/25 14:43:54 reinoud Exp $ */
/* $NetBSD: cpu.c,v 1.72 2012/07/29 18:05:47 mlelstv Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@ -30,7 +30,7 @@
#include "opt_hz.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.71 2012/06/25 14:43:54 reinoud Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.72 2012/07/29 18:05:47 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -451,7 +451,8 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
rdev ? device_xname(rdev) : "<unknown>");
setroot(rdev, 0);
booted_device = rdev;
rootconf();
}
bool

6
sys/arch/vax/vax/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.93 2011/11/10 22:33:12 njoly Exp $ */
/* $NetBSD: autoconf.c,v 1.94 2012/07/29 18:05:47 mlelstv Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.93 2011/11/10 22:33:12 njoly Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.94 2012/07/29 18:05:47 mlelstv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cputype.h"
@ -102,7 +102,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
static int mainbus_print(void *, const char *);

6
sys/arch/x68k/x68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.66 2012/04/23 05:31:31 isaki Exp $ */
/* $NetBSD: autoconf.c,v 1.67 2012/07/29 18:05:47 mlelstv Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.66 2012/04/23 05:31:31 isaki Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.67 2012/07/29 18:05:47 mlelstv Exp $");
#include "opt_compat_netbsd.h"
#include "scsibus.h"
@ -80,7 +80,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/x86/x86/x86_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: x86_autoconf.c,v 1.64 2012/07/13 16:31:49 christos Exp $ */
/* $NetBSD: x86_autoconf.c,v 1.65 2012/07/29 18:05:47 mlelstv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.64 2012/07/13 16:31:49 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.65 2012/07/29 18:05:47 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -499,7 +499,7 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
void

6
sys/arch/xen/x86/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.14 2012/06/10 17:05:19 mlelstv Exp $ */
/* $NetBSD: autoconf.c,v 1.15 2012/07/29 18:05:47 mlelstv Exp $ */
/* NetBSD: autoconf.c,v 1.75 2003/12/30 12:33:22 pk Exp */
/*-
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2012/06/10 17:05:19 mlelstv Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2012/07/29 18:05:47 mlelstv Exp $");
#include "opt_xen.h"
#include "opt_compat_oldboot.h"
@ -156,7 +156,7 @@ cpu_rootconf(void)
printf("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}

6
sys/arch/zaurus/zaurus/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.11 2012/06/13 20:04:30 mlelstv Exp $ */
/* $NetBSD: autoconf.c,v 1.12 2012/07/29 18:05:47 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2012/06/13 20:04:30 mlelstv Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2012/07/29 18:05:47 mlelstv Exp $");
#include "opt_md.h"
@ -212,7 +212,7 @@ cpu_rootconf(void)
aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
rootconf();
}
void

17
sys/kern/init_main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: init_main.c,v 1.444 2012/06/14 20:18:16 martin Exp $ */
/* $NetBSD: init_main.c,v 1.445 2012/07/29 18:05:48 mlelstv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.444 2012/06/14 20:18:16 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.445 2012/07/29 18:05:48 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@ -259,7 +259,6 @@ int start_init_exec; /* semaphore for start_init() */
cprng_strong_t *kern_cprng;
static void rootconf(void);
static void check_console(struct lwp *l);
static void start_init(void *);
static void configure(void);
@ -634,7 +633,7 @@ main(void)
* Now that autoconfiguration has completed, we can determine
* the root and dump devices.
*/
rootconf();
cpu_rootconf();
cpu_dumpconf();
/* Mount the root file system. */
@ -879,15 +878,11 @@ rootconf_handle_wedges(void)
}
}
static void
void
rootconf(void)
{
cpu_rootconf();
if (booted_device == NULL)
return;
rootconf_handle_wedges();
if (booted_device != NULL)
rootconf_handle_wedges();
setroot(booted_device, booted_partition);
}

3
sys/sys/conf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.h,v 1.142 2012/07/29 10:07:10 mlelstv Exp $ */
/* $NetBSD: conf.h,v 1.143 2012/07/29 18:05:48 mlelstv Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -266,6 +266,7 @@ void mm_init(void);
#ifdef _KERNEL
struct device;
void setroot(struct device *, int);
void rootconf(void);
void swapconf(void);
#endif /* _KERNEL */