From owner-svn-src-projects@FreeBSD.ORG  Tue Jan  5 06:58:54 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 91D781065676;
	Tue,  5 Jan 2010 06:58:54 +0000 (UTC)
	(envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 815B18FC47;
	Tue,  5 Jan 2010 06:58:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o056wsas019774;
	Tue, 5 Jan 2010 06:58:54 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o056ws7Z019771;
	Tue, 5 Jan 2010 06:58:54 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201001050658.o056ws7Z019771@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Tue, 5 Jan 2010 06:58:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201563 - projects/mips/sys/mips/mips
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2010 06:58:54 -0000

Author: neel
Date: Tue Jan  5 06:58:54 2010
New Revision: 201563
URL: http://svn.freebsd.org/changeset/base/201563

Log:
  This change increases the size of the kernel stack for thread0 from
  PAGE_SIZE to (2 * PAGE_SIZE). It depends on the memory allocated by
  pmap_steal_memory() being aligned to a PAGE_SIZE boundary.
  
  Approved by: imp (mentor)

Modified:
  projects/mips/sys/mips/mips/machdep.c
  projects/mips/sys/mips/mips/pmap.c

Modified: projects/mips/sys/mips/mips/machdep.c
==============================================================================
--- projects/mips/sys/mips/mips/machdep.c	Tue Jan  5 06:43:29 2010	(r201562)
+++ projects/mips/sys/mips/mips/machdep.c	Tue Jan  5 06:58:54 2010	(r201563)
@@ -260,8 +260,11 @@ mips_proc0_init(void)
 {
 	proc_linkup0(&proc0, &thread0);
 
+	KASSERT((kstack0 & PAGE_MASK) == 0,
+		("kstack0 is not aligned on a page boundary: 0x%0lx",
+		(long)kstack0));
 	thread0.td_kstack = kstack0;
-	thread0.td_kstack_pages = KSTACK_PAGES - 1;
+	thread0.td_kstack_pages = KSTACK_PAGES;
 	thread0.td_md.md_realstack = roundup2(thread0.td_kstack, PAGE_SIZE * 2);
 	/* 
 	 * Do not use cpu_thread_alloc to initialize these fields 

Modified: projects/mips/sys/mips/mips/pmap.c
==============================================================================
--- projects/mips/sys/mips/mips/pmap.c	Tue Jan  5 06:43:29 2010	(r201562)
+++ projects/mips/sys/mips/mips/pmap.c	Tue Jan  5 06:58:54 2010	(r201563)
@@ -291,6 +291,12 @@ pmap_bootstrap(void)
 	/* Sort. */
 again:
 	for (i = 0; phys_avail[i + 1] != 0; i += 2) {
+		/*
+		 * Keep the memory aligned on page boundary.
+		 */
+		phys_avail[i] = round_page(phys_avail[i]);
+		phys_avail[i + 1] = trunc_page(phys_avail[i + 1]);
+
 		if (phys_avail[i + 1] >= MIPS_KSEG0_LARGEST_PHYS)
 			memory_larger_than_512meg++;
 		if (i < 2)