diff options
| author |   miod <miod@openbsd.org> | 2007-03-13 19:30:36 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2007-03-13 19:30:36 +0000 |
| commit | 1fd11b5099a643aedf6c821937131fa602ed4f51 (patch) | |
| tree | d81039f5d75404dbe99e955c60612417e0c283cc | |
| parent | It is safe to run tlb_exception() at the pre-fault ipl. (diff) | |
| download | wireguard-openbsd-1fd11b5099a643aedf6c821937131fa602ed4f51.tar.xz wireguard-openbsd-1fd11b5099a643aedf6c821937131fa602ed4f51.zip | |
Move UKC later in the boot process, so that it can use malloc().
| -rw-r--r-- | sys/arch/landisk/landisk/machdep.c | 9 | ||||
| -rw-r--r-- | sys/arch/sh/sh/sh_machdep.c | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c index 82a34ba864f..5ac4fc0611d 100644 --- a/sys/arch/landisk/landisk/machdep.c +++ b/sys/arch/landisk/landisk/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.9 2007/03/03 21:37:27 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.10 2007/03/13 19:30:36 miod Exp $ */ /* $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -177,13 +177,6 @@ landisk_startup(int howto, char *_esym) Debugger(); } #endif - if (boothowto & RB_CONFIG) { -#ifdef BOOT_CONFIG - user_config(); -#else - printf("kernel does not support -c; continuing..\n"); -#endif - } /* Jump to main */ __asm volatile( diff --git a/sys/arch/sh/sh/sh_machdep.c b/sys/arch/sh/sh/sh_machdep.c index a6b1e05916b..5ca32c9f4a9 100644 --- a/sys/arch/sh/sh/sh_machdep.c +++ b/sys/arch/sh/sh/sh_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sh_machdep.c,v 1.10 2007/03/03 21:37:27 miod Exp $ */ +/* $OpenBSD: sh_machdep.c,v 1.11 2007/03/13 19:30:38 miod Exp $ */ /* $NetBSD: sh3_machdep.c,v 1.59 2006/03/04 01:13:36 uwe Exp $ */ /* @@ -104,6 +104,7 @@ #include <sys/conf.h> #include <sys/core.h> #include <sys/kcore.h> +#include <sys/reboot.h> #include <uvm/uvm_extern.h> @@ -375,6 +376,14 @@ sh_startup() ptoa(uvmexp.free) / 1024); printf("using %d buffers containing %u bytes (%uK) of memory\n", nbuf, bufpages * PAGE_SIZE, bufpages * PAGE_SIZE / 1024); + + if (boothowto & RB_CONFIG) { +#ifdef BOOT_CONFIG + user_config(); +#else + printf("kernel does not support -c; continuing..\n"); +#endif + } } /* |