Sync with sys/i386/i386/machdep.c revision 1.313.

This commit is contained in:
kato 1998-10-11 15:04:38 +00:00
parent 4db992e82c
commit 31d9650fc9
2 changed files with 16 additions and 8 deletions

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.97 1998/09/30 13:21:44 kato Exp $
* $Id: machdep.c,v 1.98 1998/10/09 12:36:25 kato Exp $
*/
#include "apm.h"
@ -1671,9 +1671,13 @@ init386(first)
proc0.p_addr->u_pcb.pcb_ext = 0;
#endif
/* Export kernel environment and module metadata information */
module_metadata = (caddr_t)bootinfo.bi_modulep;
kern_envp = (caddr_t)bootinfo.bi_envp;
/* Sigh, relocate physical addresses left from bootstrap */
if (bootinfo.bi_modulep) {
preload_metadata = (caddr_t)bootinfo.bi_modulep + KERNBASE;
preload_bootstrap_relocate(KERNBASE);
}
if (bootinfo.bi_envp)
kern_envp = (caddr_t)bootinfo.bi_envp + KERNBASE;
}
#if defined(I586_CPU) && !defined(NO_F00F_HACK)

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.97 1998/09/30 13:21:44 kato Exp $
* $Id: machdep.c,v 1.98 1998/10/09 12:36:25 kato Exp $
*/
#include "apm.h"
@ -1671,9 +1671,13 @@ init386(first)
proc0.p_addr->u_pcb.pcb_ext = 0;
#endif
/* Export kernel environment and module metadata information */
module_metadata = (caddr_t)bootinfo.bi_modulep;
kern_envp = (caddr_t)bootinfo.bi_envp;
/* Sigh, relocate physical addresses left from bootstrap */
if (bootinfo.bi_modulep) {
preload_metadata = (caddr_t)bootinfo.bi_modulep + KERNBASE;
preload_bootstrap_relocate(KERNBASE);
}
if (bootinfo.bi_envp)
kern_envp = (caddr_t)bootinfo.bi_envp + KERNBASE;
}
#if defined(I586_CPU) && !defined(NO_F00F_HACK)