From c072a76d906165af94c610fd02559c3918574933 Mon Sep 17 00:00:00 2001 From: das Date: Sat, 20 Nov 2004 02:29:36 +0000 Subject: U areas are going away, so don't allocate them. It's worrisome that mp_machdep.c was using UAREA_PAGES to allocate something that isn't a U area, and that there seems to be an implicit assumption that the PCB is just past the end of the kernel stack. Reviewed by: arch@ --- sys/alpha/alpha/machdep.c | 6 +----- sys/alpha/alpha/mp_machdep.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'sys/alpha') diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index a748f51..01d46e8 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -160,7 +160,6 @@ struct bootinfo_kernel bootinfo; struct mtx icu_lock; -struct user *proc0uarea; vm_offset_t proc0kstack; char machine[] = "alpha"; @@ -848,11 +847,9 @@ alpha_init(pfn, ptb, bim, bip, biv) proc_linkup(&proc0, &ksegrp0, &thread0); /* - * Init mapping for u page(s) for proc 0 + * Init mapping for kernel stack for proc 0 */ - proc0uarea = (struct user *)pmap_steal_memory(UAREA_PAGES * PAGE_SIZE); proc0kstack = pmap_steal_memory(KSTACK_PAGES * PAGE_SIZE); - proc0.p_uarea = proc0uarea; thread0.td_kstack = proc0kstack; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; @@ -861,7 +858,6 @@ alpha_init(pfn, ptb, bim, bip, biv) * Setup the per-CPU data for the bootstrap cpu. */ { - /* This is not a 'struct user' */ size_t sz = round_page(KSTACK_PAGES * PAGE_SIZE); pcpup = (struct pcpu *) pmap_steal_memory(sz); pcpu_init(pcpup, 0, sz); diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c index fe1dbfe..33bfe5f 100644 --- a/sys/alpha/alpha/mp_machdep.c +++ b/sys/alpha/alpha/mp_machdep.c @@ -233,7 +233,7 @@ smp_start_secondary(int pal_id, int cpuid) if (bootverbose) printf("smp_start_secondary: starting cpu %d\n", pal_id); - sz = round_page((UAREA_PAGES + KSTACK_PAGES) * PAGE_SIZE); + sz = KSTACK_PAGES * PAGE_SIZE; pcpu = malloc(sz, M_TEMP, M_NOWAIT); if (!pcpu) { printf("smp_start_secondary: can't allocate memory\n"); -- cgit v1.1