From 8375566745ec76f883fac94cf26a360d03473ab7 Mon Sep 17 00:00:00 2001 From: das Date: Sat, 20 Nov 2004 02:29:25 +0000 Subject: U areas are going away, so don't allocate one for process 0. Reviewed by: arch@ --- sys/i386/i386/locore.s | 18 ++++-------------- sys/i386/i386/machdep.c | 2 -- 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'sys/i386') diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index 72ef2bf..5b1583c 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -129,10 +129,10 @@ IdlePDPT: .long 0 /* phys addr of kernel PDPT */ #endif KPTphys: .long 0 /* phys addr of kernel page tables */ - .globl proc0uarea, proc0kstack -proc0uarea: .long 0 /* address of proc 0 uarea space */ + .globl proc0kstack +proc0uarea: .long 0 /* address of proc 0 uarea (unused)*/ proc0kstack: .long 0 /* address of proc 0 kstack space */ -p0upa: .long 0 /* phys addr of proc0's UAREA */ +p0upa: .long 0 /* phys addr of proc0 UAREA (unused) */ p0kpa: .long 0 /* phys addr of proc0's STACK */ vm86phystk: .long 0 /* PA of vm86/bios stack */ @@ -748,12 +748,7 @@ no_kernend: ALLOCPAGES(NPGPTD) movl %esi,R(IdlePTD) -/* Allocate UPAGES */ - ALLOCPAGES(UAREA_PAGES) - movl %esi,R(p0upa) - addl $KERNBASE, %esi - movl %esi, R(proc0uarea) - +/* Allocate KSTACK */ ALLOCPAGES(KSTACK_PAGES) movl %esi,R(p0kpa) addl $KERNBASE, %esi @@ -847,11 +842,6 @@ no_kernend: movl $NPGPTD, %ecx fillkptphys($PG_RW) -/* Map proc0's UPAGES in the physical way ... */ - movl R(p0upa), %eax - movl $(UAREA_PAGES), %ecx - fillkptphys($PG_RW) - /* Map proc0's KSTACK in the physical way ... */ movl R(p0kpa), %eax movl $(KSTACK_PAGES), %ecx diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index d7a02a6..897ddc6 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -1233,7 +1233,6 @@ extern int has_f00f_bug; static struct i386tss dblfault_tss; static char dblfault_stack[PAGE_SIZE]; -extern struct user *proc0uarea; extern vm_offset_t proc0kstack; @@ -1956,7 +1955,6 @@ init386(first) int gsel_tss, metadata_missing, off, x; struct pcpu *pc; - proc0.p_uarea = proc0uarea; thread0.td_kstack = proc0kstack; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; -- cgit v1.1