Date: Fri, 4 Jan 2008 15:25:18 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 132485 for review Message-ID: <200801041525.m04FPIrt011288@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=132485 Change 132485 by raj@raj_mimi on 2008/01/04 15:24:25 Temporary fix to avoid confusion of 'kstack0' symbol and make e500 kernel operational again. kstack0 area requires further improvements (space for kstack0 is now statically defined within kernel body, does not have guard pages etc., which should be fixed) Affected files ... .. //depot/projects/e500/sys/powerpc/booke/locore.S#3 edit .. //depot/projects/e500/sys/powerpc/booke/machdep.c#4 edit Differences ... ==== //depot/projects/e500/sys/powerpc/booke/locore.S#3 (text+ko) ==== @@ -255,8 +255,8 @@ /* * Setup a temporary stack */ - lis %r1, kstack0@ha - addi %r1, %r1, kstack0@l + lis %r1, kstack0_space@ha + addi %r1, %r1, kstack0_space@l addi %r1, %r1, (16384 - 256) /* @@ -466,7 +466,7 @@ /************************************************************************/ .data .align 4 -GLOBAL(kstack0) +GLOBAL(kstack0_space) .space 16384 /* ==== //depot/projects/e500/sys/powerpc/booke/machdep.c#4 (text+ko) ==== @@ -153,6 +153,8 @@ extern void *trapcode, *trapsize; +extern unsigned char kstack0_space[]; + struct kva_md_info kmi; struct pcpu __pcpu[MAXCPU]; struct trapframe frame0; @@ -406,7 +408,7 @@ init_param2(physmem); /* Finish setting up thread0. */ - thread0.td_kstack = (uintptr_t)kstack0; + thread0.td_kstack = (vm_offset_t)kstack0_space; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; bzero((void *)thread0.td_pcb, sizeof(struct pcb));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801041525.m04FPIrt011288>