diff options
| author | marcel <marcel@FreeBSD.org> | 2008-02-12 20:55:51 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2008-02-12 20:55:51 +0000 |
| commit | 06a30b50ee14d137e2cf4755c15388c7e21ef5ed (patch) | |
| tree | 15994c7ed2c8f22179988d5abcf2e363ab41bd7c | |
| parent | b24cb219b9c5b9c7e769dbd2d26caad935b998fd (diff) | |
| download | FreeBSD-src-06a30b50ee14d137e2cf4755c15388c7e21ef5ed.zip FreeBSD-src-06a30b50ee14d137e2cf4755c15388c7e21ef5ed.tar.gz | |
Remove SMP left-overs from NetBSD.
| -rw-r--r-- | sys/powerpc/aim/machdep.c | 14 | ||||
| -rw-r--r-- | sys/powerpc/aim/ofw_machdep.c | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 16da70e..b286185 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -127,8 +127,8 @@ extern vm_offset_t ksym_start, ksym_end; int cold = 1; -struct pcpu __pcpu[MAXCPU]; -struct trapframe frame0; +static struct pcpu pcpu0; +static struct trapframe frame0; vm_offset_t kstack0; vm_offset_t kstack0_phys; @@ -234,14 +234,6 @@ cpu_startup(void *dummy) EVENTHANDLER_REGISTER(shutdown_final, powerpc_ofw_shutdown, 0, SHUTDOWN_PRI_LAST); - -#ifdef SMP - /* - * OK, enough kmem_alloc/malloc state should be up, lets get on with it! - */ - mp_start(); /* fire up the secondaries */ - mp_announce(); -#endif /* SMP */ } extern char kernel_text[], _end[]; @@ -298,7 +290,7 @@ powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp) /* * Set up per-cpu data. */ - pc = &__pcpu[0]; + pc = &pcpu0; pcpu_init(pc, 0, sizeof(struct pcpu)); pc->pc_curthread = &thread0; pc->pc_curpcb = thread0.td_pcb; diff --git a/sys/powerpc/aim/ofw_machdep.c b/sys/powerpc/aim/ofw_machdep.c index 1f40c92..d6ec2f3 100644 --- a/sys/powerpc/aim/ofw_machdep.c +++ b/sys/powerpc/aim/ofw_machdep.c @@ -63,7 +63,6 @@ static struct mem_region OFmem[OFMEM_REGIONS + 1], OFavail[OFMEM_REGIONS + 3]; static struct mem_region OFfree[OFMEM_REGIONS + 3]; extern register_t ofmsr[5]; -extern struct pcpu __pcpu[MAXCPU]; extern struct pmap ofw_pmap; static int (*ofwcall)(void *); |
