diff options
| author | mlelstv <mlelstv@NetBSD.org> | 2012-07-29 18:05:39 +0000 |
|---|---|---|
| committer | mlelstv <mlelstv@NetBSD.org> | 2012-07-29 18:05:39 +0000 |
| commit | 40637d6dcda12ed89a8ac2322971d477e6781b7e (patch) | |
| tree | 5832f179034afd884f048c61ab501d60fe42111e /sys/arch/usermode/dev | |
| parent | 6468a01d475f4178cd44fab559d63df87688d299 (diff) | |
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.
Diffstat (limited to 'sys/arch/usermode/dev')
| -rw-r--r-- | sys/arch/usermode/dev/cpu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/usermode/dev/cpu.c b/sys/arch/usermode/dev/cpu.c index d2cc791c0f2..a60c80c1922 100644 --- a/sys/arch/usermode/dev/cpu.c +++ b/sys/arch/usermode/dev/cpu.c @@ -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 |
