Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Pull up following revision(s) (requested by mlelstv in ti...
details: https://anonhg.NetBSD.org/src/rev/7b403afe4266
branches: netbsd-6
changeset: 774391:7b403afe4266
user: martin <martin%NetBSD.org@localhost>
date: Wed Aug 08 15:51:02 2012 +0000
description:
Pull up following revision(s) (requested by mlelstv in ticket #466):
sys/arch/amiga/amiga/autoconf.c: revision 1.113
sys/arch/rs6000/rs6000/autoconf.c: revision 1.4
sys/arch/emips/emips/autoconf.c: revision 1.6
sys/arch/sandpoint/sandpoint/autoconf.c: revision 1.27
sys/arch/evbmips/alchemy/autoconf.c: revision 1.18
sys/arch/sgimips/sgimips/autoconf.c: revision 1.43
sys/arch/atari/atari/autoconf.c: revision 1.63
sys/arch/powerpc/oea/ofw_autoconf.c: revision 1.17
sys/arch/mmeye/mmeye/autoconf.c: revision 1.9
distrib/sets/lists/comp/mi: revision 1.1771
sys/arch/mipsco/mipsco/autoconf.c: revision 1.25
sys/arch/iyonix/iyonix/autoconf.c: revision 1.14
sys/arch/hp300/hp300/autoconf.c: revision 1.100
sys/kern/init_main.c: revision 1.445
sys/arch/pmax/pmax/autoconf.c: revision 1.79
sys/arch/netwinder/netwinder/autoconf.c: revision 1.11
sys/arch/dreamcast/dreamcast/autoconf.c: revision 1.10
sys/arch/ibmnws/ibmnws/autoconf.c: revision 1.12
sys/arch/evbppc/ev64260/autoconf.c: revision 1.17
sys/arch/evbmips/gdium/autoconf.c: revision 1.5
sys/arch/algor/algor/autoconf.c: revision 1.21
share/man/man9/Makefile: revision 1.367
sys/arch/ews4800mips/ews4800mips/autoconf.c: revision 1.9
sys/arch/amigappc/amigappc/autoconf.c: revision 1.5
sys/arch/x86/x86/x86_autoconf.c: revision 1.65
sys/arch/acorn26/acorn26/autoconf.c: revision 1.9
sys/arch/mvmeppc/mvmeppc/autoconf.c: revision 1.13
sys/arch/vax/vax/autoconf.c: revision 1.94
sys/arch/usermode/dev/cpu.c: revision 1.72
sys/arch/evbppc/virtex/autoconf.c: revision 1.5
sys/arch/next68k/next68k/autoconf.c: revision 1.26
sys/arch/mac68k/mac68k/autoconf.c: revision 1.73
sys/arch/ia64/ia64/autoconf.c: revision 1.6
sys/arch/evbppc/obs405/obs405_autoconf.c: revision 1.6
share/man/man9/cpu_rootconf.9: revision 1.7
sys/arch/landisk/landisk/autoconf.c: revision 1.6
sys/arch/evbmips/malta/autoconf.c: revision 1.16
sys/arch/sun3/sun3/autoconf.c: revision 1.76
sys/arch/evbppc/explora/autoconf.c: revision 1.13
sys/arch/sun3/sun3/autoconf.c: revision 1.77
sys/arch/evbmips/loongson/autoconf.c: revision 1.3
sys/arch/evbmips/atheros/autoconf.c: revision 1.11
sys/arch/sparc64/sparc64/autoconf.c: revision 1.188
sys/arch/acorn32/acorn32/autoconf.c: revision 1.18
sys/arch/evbarm/evbarm/autoconf.c: revision 1.13
sys/arch/cobalt/cobalt/autoconf.c: revision 1.30
sys/arch/mvme68k/mvme68k/autoconf.c: revision 1.46
sys/arch/hp700/hp700/autoconf.c: revision 1.48
sys/arch/evbmips/adm5120/autoconf.c: revision 1.5
sys/arch/hpcmips/hpcmips/autoconf.c: revision 1.25
sys/arch/alpha/alpha/autoconf.c: revision 1.52
sys/arch/sparc/sparc/autoconf.c: revision 1.244
sys/arch/evbppc/pmppc/autoconf.c: revision 1.7
sys/arch/bebox/bebox/autoconf.c: revision 1.25
sys/arch/luna68k/luna68k/autoconf.c: revision 1.13
sys/arch/hpcarm/hpcarm/autoconf.c: revision 1.20
sys/arch/evbppc/walnut/autoconf.c: revision 1.21
sys/arch/cesfic/cesfic/autoconf.c: revision 1.26
sys/arch/cats/cats/autoconf.c: revision 1.17
sys/arch/x68k/x68k/autoconf.c: revision 1.67
sys/arch/news68k/news68k/autoconf.c: revision 1.21
sys/arch/arc/arc/autoconf.c: revision 1.34
sys/arch/evbsh3/evbsh3/autoconf.c: revision 1.11
sys/sys/conf.h: revision 1.143
sys/arch/evbmips/rasoc/autoconf.c: revision 1.3
sys/arch/hpcsh/hpcsh/autoconf.c: revision 1.26
sys/arch/sun68k/sun68k/autoconf.c: revision 1.29
sys/arch/evbmips/rmixl/autoconf.c: revision 1.6
sys/arch/zaurus/zaurus/autoconf.c: revision 1.12
sys/arch/xen/x86/autoconf.c: revision 1.15
sys/arch/evbppc/mpc85xx/autoconf.c: revision 1.6
sys/arch/shark/shark/autoconf.c: revision 1.18
sys/arch/prep/prep/autoconf.c: revision 1.25
sys/arch/newsmips/newsmips/autoconf.c: revision 1.36
sys/arch/sbmips/sbmips/autoconf.c: revision 1.8
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.
add rootconf(9) as a link to cpu_rootconf(9)
make this compile again
diffstat:
distrib/sets/lists/comp/mi | 4 ++-
share/man/man9/Makefile | 5 ++-
share/man/man9/cpu_rootconf.9 | 42 +++++++++++++++++++++-------
sys/arch/acorn26/acorn26/autoconf.c | 7 ++--
sys/arch/acorn32/acorn32/autoconf.c | 6 ++--
sys/arch/algor/algor/autoconf.c | 6 ++--
sys/arch/alpha/alpha/autoconf.c | 6 ++--
sys/arch/amiga/amiga/autoconf.c | 9 ++----
sys/arch/amigappc/amigappc/autoconf.c | 9 ++----
sys/arch/arc/arc/autoconf.c | 7 ++--
sys/arch/atari/atari/autoconf.c | 6 ++--
sys/arch/bebox/bebox/autoconf.c | 6 ++--
sys/arch/cats/cats/autoconf.c | 6 ++--
sys/arch/cesfic/cesfic/autoconf.c | 6 ++--
sys/arch/cobalt/cobalt/autoconf.c | 6 ++--
sys/arch/dreamcast/dreamcast/autoconf.c | 6 ++--
sys/arch/emips/emips/autoconf.c | 6 ++--
sys/arch/evbarm/evbarm/autoconf.c | 6 ++--
sys/arch/evbmips/adm5120/autoconf.c | 6 ++--
sys/arch/evbmips/alchemy/autoconf.c | 6 ++--
sys/arch/evbmips/atheros/autoconf.c | 6 ++--
sys/arch/evbmips/gdium/autoconf.c | 6 ++--
sys/arch/evbmips/loongson/autoconf.c | 6 ++--
sys/arch/evbmips/malta/autoconf.c | 6 ++--
sys/arch/evbmips/rasoc/autoconf.c | 6 ++--
sys/arch/evbmips/rmixl/autoconf.c | 6 ++--
sys/arch/evbppc/ev64260/autoconf.c | 6 ++--
sys/arch/evbppc/explora/autoconf.c | 6 ++--
sys/arch/evbppc/mpc85xx/autoconf.c | 6 ++--
sys/arch/evbppc/obs405/obs405_autoconf.c | 6 ++--
sys/arch/evbppc/pmppc/autoconf.c | 6 ++--
sys/arch/evbppc/virtex/autoconf.c | 6 ++--
sys/arch/evbppc/walnut/autoconf.c | 6 ++--
sys/arch/evbsh3/evbsh3/autoconf.c | 6 ++--
sys/arch/ews4800mips/ews4800mips/autoconf.c | 11 ++++---
sys/arch/hp300/hp300/autoconf.c | 10 ++----
sys/arch/hp700/hp700/autoconf.c | 7 ++--
sys/arch/hpcarm/hpcarm/autoconf.c | 6 ++--
sys/arch/hpcmips/hpcmips/autoconf.c | 8 ++--
sys/arch/hpcsh/hpcsh/autoconf.c | 6 ++--
sys/arch/ia64/ia64/autoconf.c | 4 +-
sys/arch/ibmnws/ibmnws/autoconf.c | 4 +-
sys/arch/iyonix/iyonix/autoconf.c | 6 ++--
sys/arch/landisk/landisk/autoconf.c | 6 ++--
sys/arch/luna68k/luna68k/autoconf.c | 6 ++--
sys/arch/mac68k/mac68k/autoconf.c | 6 ++--
sys/arch/mipsco/mipsco/autoconf.c | 6 ++--
sys/arch/mmeye/mmeye/autoconf.c | 6 ++--
sys/arch/mvme68k/mvme68k/autoconf.c | 7 ++--
sys/arch/mvmeppc/mvmeppc/autoconf.c | 6 ++--
sys/arch/netwinder/netwinder/autoconf.c | 6 ++--
sys/arch/news68k/news68k/autoconf.c | 6 ++--
sys/arch/newsmips/newsmips/autoconf.c | 6 ++--
sys/arch/next68k/next68k/autoconf.c | 6 ++--
sys/arch/pmax/pmax/autoconf.c | 6 ++--
sys/arch/powerpc/oea/ofw_autoconf.c | 6 ++--
sys/arch/prep/prep/autoconf.c | 6 ++--
sys/arch/rs6000/rs6000/autoconf.c | 6 ++--
sys/arch/sandpoint/sandpoint/autoconf.c | 6 ++--
sys/arch/sbmips/sbmips/autoconf.c | 6 ++--
sys/arch/sgimips/sgimips/autoconf.c | 6 ++--
sys/arch/shark/shark/autoconf.c | 6 ++--
sys/arch/sparc/sparc/autoconf.c | 14 ++++-----
sys/arch/sparc64/sparc64/autoconf.c | 8 ++---
sys/arch/sun3/sun3/autoconf.c | 24 +++++++--------
sys/arch/sun68k/sun68k/autoconf.c | 24 +++++++--------
sys/arch/usermode/dev/cpu.c | 7 ++--
sys/arch/vax/vax/autoconf.c | 6 ++--
sys/arch/x68k/x68k/autoconf.c | 6 ++--
sys/arch/x86/x86/x86_autoconf.c | 6 ++--
sys/arch/xen/x86/autoconf.c | 6 ++--
sys/arch/zaurus/zaurus/autoconf.c | 6 ++--
sys/kern/init_main.c | 17 ++++-------
sys/sys/conf.h | 3 +-
74 files changed, 278 insertions(+), 271 deletions(-)
diffs (truncated from 2144 to 300 lines):
diff -r 858fa91c73c5 -r 7b403afe4266 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Wed Aug 08 15:37:49 2012 +0000
+++ b/distrib/sets/lists/comp/mi Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1738.2.4 2012/06/05 15:37:19 jdc Exp $
+# $NetBSD: mi,v 1.1738.2.5 2012/08/08 15:51:03 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -16711,6 +16711,7 @@
./usr/share/man/html9/rnd_attach_source.html comp-sys-htmlman html
./usr/share/man/html9/rnd_detach_source.html comp-sys-htmlman html
./usr/share/man/html9/rnd_extract_data.html comp-sys-htmlman html
+./usr/share/man/html9/rootconf.html comp-sys-htmlman html
./usr/share/man/html9/rounddown.html comp-sys-htmlman html
./usr/share/man/html9/roundup.html comp-sys-htmlman html
./usr/share/man/html9/roundup2.html comp-sys-htmlman html
@@ -23059,6 +23060,7 @@
./usr/share/man/man9/rnd_attach_source.9 comp-sys-man .man
./usr/share/man/man9/rnd_detach_source.9 comp-sys-man .man
./usr/share/man/man9/rnd_extract_data.9 comp-sys-man .man
+./usr/share/man/man9/rootconf.9 comp-sys-man .man
./usr/share/man/man9/rounddown.9 comp-sys-man .man
./usr/share/man/man9/roundup.9 comp-sys-man .man
./usr/share/man/man9/roundup2.9 comp-sys-man .man
diff -r 858fa91c73c5 -r 7b403afe4266 share/man/man9/Makefile
--- a/share/man/man9/Makefile Wed Aug 08 15:37:49 2012 +0000
+++ b/share/man/man9/Makefile Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.362 2011/12/04 21:08:45 jym Exp $
+# $NetBSD: Makefile,v 1.362.2.1 2012/08/08 15:51:07 martin Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -250,7 +250,8 @@
MLINKS+=cpu_dumpconf.9 cpu_dump.9 cpu_dumpconf.9 cpu_dumpsize.9 \
cpu_dumpconf.9 dumpsys.9
MLINKS+=cpu_lwp_fork.9 child_return.9 cpu_lwp_fork.9 proc_trampoline.9
-MLINKS+=cpu_rootconf.9 setroot.9
+MLINKS+=cpu_rootconf.9 setroot.9 \
+ cpu_rootconf.9 rootconf.9
MLINKS+=cpufreq.9 cpufreq_register.9 \
cpufreq.9 cpufreq_deregister.9 \
cpufreq.9 cpufreq_suspend.9 \
diff -r 858fa91c73c5 -r 7b403afe4266 share/man/man9/cpu_rootconf.9
--- a/share/man/man9/cpu_rootconf.9 Wed Aug 08 15:37:49 2012 +0000
+++ b/share/man/man9/cpu_rootconf.9 Wed Aug 08 15:51:02 2012 +0000
@@ -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.6.10.1 2012/08/08 15:51:07 martin 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 @@
is a machine-dependent interface invoked during system bootstrap to
determine the root file system device and initialize machine-dependent
file system state.
+.Fn cpu_rootconf
+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
-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
-for use in machine-independent code.
+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
diff -r 858fa91c73c5 -r 7b403afe4266 sys/arch/acorn26/acorn26/autoconf.c
--- a/sys/arch/acorn26/acorn26/autoconf.c Wed Aug 08 15:37:49 2012 +0000
+++ b/sys/arch/acorn26/acorn26/autoconf.c Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.8 2011/12/17 14:51:07 kiyohara Exp $ */
+/* $NetBSD: autoconf.c,v 1.8.2.1 2012/08/08 15:51:08 martin 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.8.2.1 2012/08/08 15:51:08 martin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -57,8 +57,7 @@
cpu_rootconf(void)
{
- /* XXX This could actually do something */
- setroot(NULL, 0);
+ rootconf();
}
void
diff -r 858fa91c73c5 -r 7b403afe4266 sys/arch/acorn32/acorn32/autoconf.c
--- a/sys/arch/acorn32/acorn32/autoconf.c Wed Aug 08 15:37:49 2012 +0000
+++ b/sys/arch/acorn32/acorn32/autoconf.c Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.17 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.17.8.1 2012/08/08 15:51:10 martin 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.17.8.1 2012/08/08 15:51:10 martin Exp $");
#include "opt_md.h"
@@ -137,7 +137,7 @@
printf("boot device: %s\n",
booted_device != NULL ? device_xname(booted_device) : "<unknown>");
#endif
- setroot(booted_device, booted_partition);
+ rootconf();
}
diff -r 858fa91c73c5 -r 7b403afe4266 sys/arch/algor/algor/autoconf.c
--- a/sys/arch/algor/algor/autoconf.c Wed Aug 08 15:37:49 2012 +0000
+++ b/sys/arch/algor/algor/autoconf.c Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.20 2011/07/09 16:03:00 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.20.8.1 2012/08/08 15:51:07 martin 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.20.8.1 2012/08/08 15:51:07 martin Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -77,7 +77,7 @@
cpu_rootconf(void)
{
- setroot(booted_device, booted_partition);
+ rootconf();
}
#if defined(ALGOR_P4032)
diff -r 858fa91c73c5 -r 7b403afe4266 sys/arch/alpha/alpha/autoconf.c
--- a/sys/arch/alpha/alpha/autoconf.c Wed Aug 08 15:37:49 2012 +0000
+++ b/sys/arch/alpha/alpha/autoconf.c Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.51 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.51.2.1 2012/08/08 15:51:11 martin 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.51.2.1 2012/08/08 15:51:11 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@
if (booted_device == NULL)
printf("WARNING: can't figure what device matches \"%s\"\n",
bootinfo.booted_dev);
- setroot(booted_device, booted_partition);
+ rootconf();
}
void
diff -r 858fa91c73c5 -r 7b403afe4266 sys/arch/amiga/amiga/autoconf.c
--- a/sys/arch/amiga/amiga/autoconf.c Wed Aug 08 15:37:49 2012 +0000
+++ b/sys/arch/amiga/amiga/autoconf.c Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.110 2012/02/12 16:34:06 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.110.2.1 2012/08/08 15:51:02 martin Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.110 2012/02/12 16:34:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.110.2.1 2012/08/08 15:51:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,10 +127,7 @@
#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*/
diff -r 858fa91c73c5 -r 7b403afe4266 sys/arch/amigappc/amigappc/autoconf.c
--- a/sys/arch/amigappc/amigappc/autoconf.c Wed Aug 08 15:37:49 2012 +0000
+++ b/sys/arch/amigappc/amigappc/autoconf.c Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.4 2011/06/18 08:08:27 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.4.8.1 2012/08/08 15:51:07 martin 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.4.8.1 2012/08/08 15:51:07 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,10 +91,7 @@
#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*/
diff -r 858fa91c73c5 -r 7b403afe4266 sys/arch/arc/arc/autoconf.c
--- a/sys/arch/arc/arc/autoconf.c Wed Aug 08 15:37:49 2012 +0000
+++ b/sys/arch/arc/arc/autoconf.c Wed Aug 08 15:51:02 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.33 2011/02/20 07:52:42 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.33.10.1 2012/08/08 15:51:12 martin 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.33.10.1 2012/08/08 15:51:12 martin Exp $");
#include <sys/param.h>
Home |
Main Index |
Thread Index |
Old Index