From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 16:29:24 2009 Return-Path: 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 4BCE31065670; Tue, 24 Nov 2009 16:29:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3B8658FC27; Tue, 24 Nov 2009 16:29:24 +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 nAOGTOYr023620; Tue, 24 Nov 2009 16:29:24 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOGTNtJ023619; Tue, 24 Nov 2009 16:29:23 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200911241629.nAOGTNtJ023619@svn.freebsd.org> From: Warner Losh Date: Tue, 24 Nov 2009 16:29:23 +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: r199752 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2009 16:29:24 -0000 Author: imp Date: Tue Nov 24 16:29:23 2009 New Revision: 199752 URL: http://svn.freebsd.org/changeset/base/199752 Log: Make sure kstack0 is page aligned. # this may have been from neel@ for the sibyte stuff Modified: projects/mips/sys/mips/mips/machdep.c Modified: projects/mips/sys/mips/mips/machdep.c ============================================================================== --- projects/mips/sys/mips/mips/machdep.c Tue Nov 24 14:57:50 2009 (r199751) +++ projects/mips/sys/mips/mips/machdep.c Tue Nov 24 16:29:23 2009 (r199752) @@ -42,6 +42,7 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_cputype.h" #include "opt_ddb.h" #include "opt_md.h" #include "opt_msgbuf.h" @@ -259,8 +260,12 @@ void mips_proc0_init(void) { proc_linkup(&proc0, &thread0); + + KASSERT((kstack0 & PAGE_MASK) == 0, + ("kstack0 is not aligned on a page boundary: %#lx\n", + (unsigned 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); /* Initialize pcpu info of cpu-zero */ #ifdef SMP