From owner-p4-projects@FreeBSD.ORG  Fri Jan  4 15:25:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 436E616A41B; Fri,  4 Jan 2008 15:25:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 085A616A417
	for <perforce@freebsd.org>; Fri,  4 Jan 2008 15:25:19 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ECADA13C447
	for <perforce@freebsd.org>; Fri,  4 Jan 2008 15:25:18 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m04FPIlF011291
	for <perforce@freebsd.org>; Fri, 4 Jan 2008 15:25:18 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m04FPIrt011288
	for perforce@freebsd.org; Fri, 4 Jan 2008 15:25:18 GMT
	(envelope-from raj@freebsd.org)
Date: Fri, 4 Jan 2008 15:25:18 GMT
Message-Id: <200801041525.m04FPIrt011288@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132485 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jan 2008 15:25:19 -0000

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));