Don't call configure() from cpu_startup().
This commit is contained in:
parent
ed8849cd5a
commit
967b8c433c
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.165 1999/03/26 23:41:25 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.166 1999/04/01 00:17:45 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -82,7 +82,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.165 1999/03/26 23:41:25 mycroft Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.166 1999/04/01 00:17:45 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -1122,11 +1122,6 @@ cpu_startup()
|
|||
* CPUs.
|
||||
*/
|
||||
hwrpb_primary_init();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: autoconf.c,v 1.62 1999/03/19 21:40:24 is Exp $ */
|
||||
/* $NetBSD: autoconf.c,v 1.63 1999/04/01 00:17:46 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Christian E. Hopps
|
||||
|
@ -111,6 +111,9 @@ configure()
|
|||
splx(s);
|
||||
#endif
|
||||
cold = 0;
|
||||
#ifdef DEBUG_KERNEL_START
|
||||
printf("survived configure...\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.132 1999/03/26 23:41:27 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.133 1999/04/01 00:17:46 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -484,13 +484,6 @@ again:
|
|||
|
||||
#ifdef DEBUG_KERNEL_START
|
||||
printf("survived bufinit...\n");
|
||||
#endif
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
#ifdef DEBUG_KERNEL_START
|
||||
printf("survived configure...\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.64 1999/03/26 22:00:25 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.65 1999/04/01 00:17:46 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1998 Mark Brinicombe.
|
||||
|
@ -506,11 +506,6 @@ cpu_startup()
|
|||
(vm_offset_t)(kernel_pmap)->pm_pdir);
|
||||
|
||||
proc0.p_md.md_regs = (struct trapframe *)curpcb->pcb_sp - 1;
|
||||
|
||||
/*
|
||||
* Configure the hardware
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.78 1999/03/26 23:41:28 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.79 1999/04/01 00:17:46 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -418,11 +418,6 @@ again:
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.32 1999/03/26 23:41:28 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.33 1999/04/01 00:17:46 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
@ -573,11 +573,6 @@ cpu_startup()
|
|||
asm volatile ("mfmsr %0; ori %0,%0,%1; mtmsr %0"
|
||||
: "=r"(msr) : "K"(PSL_EE));
|
||||
}
|
||||
|
||||
/*
|
||||
* Configure devices.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.122 1999/04/01 00:17:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -428,11 +428,6 @@ cpu_startup()
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.347 1999/03/30 08:21:54 bouyer Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.348 1999/04/01 00:17:47 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -531,11 +531,8 @@ cpu_startup()
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
/* Safe for i/o port allocation to use malloc now. */
|
||||
ioport_malloc_safe = 1;
|
||||
configure();
|
||||
|
||||
/*
|
||||
* Set up proc0's TSS and LDT.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.226 1999/03/27 05:01:28 briggs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.227 1999/04/01 00:17:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -570,11 +570,8 @@ again:
|
|||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
/* Safe for extent allocation to use malloc now. */
|
||||
iomem_malloc_safe = 1;
|
||||
configure();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: autoconf.c,v 1.9 1999/02/02 16:37:51 tsubai Exp $ */
|
||||
/* $NetBSD: autoconf.c,v 1.10 1999/04/01 00:17:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
@ -91,6 +91,16 @@ configure()
|
|||
|
||||
(void)spl0();
|
||||
cold = 0;
|
||||
|
||||
/*
|
||||
* Now allow hardware interrupts.
|
||||
*/
|
||||
{
|
||||
int msr;
|
||||
|
||||
asm volatile ("mfmsr %0; ori %0,%0,%1; mtmsr %0"
|
||||
: "=r"(msr) : "K"((u_short)(PSL_EE|PSL_RI)));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.37 1999/03/26 23:41:31 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.38 1999/04/01 00:17:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
@ -570,21 +570,6 @@ cpu_startup()
|
|||
* Set up the buffers.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure devices.
|
||||
*/
|
||||
configure();
|
||||
|
||||
/*
|
||||
* Now allow hardware interrupts.
|
||||
*/
|
||||
{
|
||||
int msr;
|
||||
|
||||
asm volatile ("mfmsr %0; ori %0,%0,%1; mtmsr %0"
|
||||
: "=r"(msr) : "K"((u_short)(PSL_EE|PSL_RI)));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.51 1999/03/26 23:41:31 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.52 1999/04/01 00:17:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -525,11 +525,6 @@ cpu_startup()
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.23 1999/03/26 23:41:32 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.24 1999/04/01 00:17:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -43,7 +43,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23 1999/03/26 23:41:32 mycroft Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 1999/04/01 00:17:48 thorpej Exp $");
|
||||
|
||||
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
|
||||
|
||||
|
@ -424,11 +424,6 @@ cpu_startup()
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.18 1999/03/27 02:59:41 dbj Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.19 1999/04/01 00:17:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -467,11 +467,6 @@ cpu_startup()
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.34 1999/03/26 23:41:33 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.35 1999/04/01 00:17:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
@ -495,11 +495,6 @@ cpu_startup()
|
|||
asm volatile ("mfmsr %0; ori %0,%0,%1; mtmsr %0"
|
||||
: "=r"(msr) : "K"((u_short)(PSL_EE|PSL_RI)));
|
||||
}
|
||||
|
||||
/*
|
||||
* Configure devices.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.95 1999/03/26 23:41:33 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.96 1999/04/01 00:17:48 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996 Matthias Pfaller.
|
||||
|
@ -354,11 +354,6 @@ cpu_startup()
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.21 1999/01/09 22:10:20 thorpej Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.22 1999/04/01 00:17:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -563,11 +563,6 @@ cpu_startup()
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.133 1999/03/28 01:56:41 simonb Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.134 1999/04/01 00:17:49 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -43,7 +43,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.133 1999/03/28 01:56:41 simonb Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.134 1999/04/01 00:17:49 thorpej Exp $");
|
||||
|
||||
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
|
||||
|
||||
|
@ -649,11 +649,6 @@ cpu_startup()
|
|||
le_iomem = VM_PAGE_TO_PHYS(mlist.tqh_first);
|
||||
}
|
||||
#endif /* NLE_IOASIC */
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.142 1999/03/26 23:41:35 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.143 1999/04/01 00:17:49 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -331,11 +331,6 @@ cpu_startup()
|
|||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system. The cpu code will turn on the cache.
|
||||
*/
|
||||
configure();
|
||||
|
||||
pmap_redzone();
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.35 1999/03/28 19:01:03 eeh Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.36 1999/04/01 00:17:49 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -322,11 +322,6 @@ cpu_startup()
|
|||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system. The cpu code will turn on the cache.
|
||||
*/
|
||||
configure();
|
||||
|
||||
#if 0
|
||||
pmap_redzone();
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.124 1999/03/26 23:41:37 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.125 1999/04/01 00:17:49 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995 Gordon W. Ross
|
||||
|
@ -426,11 +426,6 @@ cpu_startup()
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.44 1999/03/30 06:12:40 gwr Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.45 1999/04/01 00:17:50 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -421,11 +421,6 @@ cpu_startup()
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.75 1999/03/26 23:41:38 mycroft Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.76 1999/04/01 00:17:50 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
|
||||
|
@ -306,11 +306,6 @@ cpu_startup()
|
|||
*/
|
||||
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.59 1999/03/31 14:22:21 minoura Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.60 1999/04/01 00:17:50 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -482,11 +482,6 @@ again:
|
|||
* Set up buffers, so they can be used to read disk labels.
|
||||
*/
|
||||
bufinit();
|
||||
|
||||
/*
|
||||
* Configure the system.
|
||||
*/
|
||||
configure();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue