summaryrefslogtreecommitdiffstats
path: root/sys/arm/at91
diff options
context:
space:
mode:
authorcognet <cognet@FreeBSD.org>2006-03-22 22:31:31 +0000
committercognet <cognet@FreeBSD.org>2006-03-22 22:31:31 +0000
commit311d69f6202d4e923371ba22aa79e9e3fc521e6e (patch)
tree04e7981cb85e9e4b7f5e8347e8751593a0bc1f1d /sys/arm/at91
parent98d6dd1b77f983a297a8d20f1d5c89a970eb0c61 (diff)
downloadFreeBSD-src-311d69f6202d4e923371ba22aa79e9e3fc521e6e.zip
FreeBSD-src-311d69f6202d4e923371ba22aa79e9e3fc521e6e.tar.gz
MFp4: Don't force single-user now we can go multi-user.
Call cninit() only after the pagetable has been set, as locore.S won't map the system device for us anymore.
Diffstat (limited to 'sys/arm/at91')
-rw-r--r--sys/arm/at91/kb920x_machdep.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/arm/at91/kb920x_machdep.c b/sys/arm/at91/kb920x_machdep.c
index de881b5..32ecc9d 100644
--- a/sys/arm/at91/kb920x_machdep.c
+++ b/sys/arm/at91/kb920x_machdep.c
@@ -203,7 +203,6 @@ initarm(void *arg, void *arg2)
i = 0;
set_cpufuncs();
- cninit();
fake_preload[i++] = MODINFO_NAME;
fake_preload[i++] = strlen("elf kernel") + 1;
@@ -343,6 +342,7 @@ initarm(void *arg, void *arg2)
setttb(kernel_l1pt.pv_pa);
cpu_tlb_flushID();
cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2));
+ cninit();
/*
* Pages were allocated during the secondary bootstrap for the
@@ -415,7 +415,6 @@ initarm(void *arg, void *arg2)
init_param2(memsize / PAGE_SIZE);
avail_end = KERNPHYSADDR + memsize - 1;
kdb_init();
- boothowto = RB_SINGLE;
return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP -
sizeof(struct pcb)));
}
OpenPOWER on IntegriCloud