From owner-svn-src-projects@FreeBSD.ORG  Sun Mar 14 00:32:19 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 158BD106564A;
	Sun, 14 Mar 2010 00:32:19 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 053418FC19;
	Sun, 14 Mar 2010 00:32:19 +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 o2E0WIJo080339;
	Sun, 14 Mar 2010 00:32:18 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2E0WIN0080337;
	Sun, 14 Mar 2010 00:32:18 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201003140032.o2E0WIN0080337@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 14 Mar 2010 00:32:18 +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: r205139 - projects/ppc64/sys/powerpc/aim
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: Sun, 14 Mar 2010 00:32:19 -0000

Author: nwhitehorn
Date: Sun Mar 14 00:32:18 2010
New Revision: 205139
URL: http://svn.freebsd.org/changeset/base/205139

Log:
  Don't spill existing SLB entries. We can't handle this yet, and it results
  in randomly demapping bits of the kernel. Which is bad.
  
  Reported by:	Andreas Tobler

Modified:
  projects/ppc64/sys/powerpc/aim/slb.c

Modified: projects/ppc64/sys/powerpc/aim/slb.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/slb.c	Sat Mar 13 22:53:17 2010	(r205138)
+++ projects/ppc64/sys/powerpc/aim/slb.c	Sun Mar 14 00:32:18 2010	(r205139)
@@ -91,12 +91,16 @@ allocate_vsid(pmap_t pm, uint64_t esid)
 	return (vsid);
 }
 
+#ifdef NOTYET /* We don't have a back-up list. Spills are a bad idea. */
 /* Lock entries mapping kernel text and stacks */
 
 #define SLB_SPILLABLE(slbe) \
 	(((slbe & SLBE_ESID_MASK) < VM_MIN_KERNEL_ADDRESS && \
 	    (slbe & SLBE_ESID_MASK) > SEGMENT_LENGTH) || \
 	    (slbe & SLBE_ESID_MASK) > VM_MAX_KERNEL_ADDRESS)
+#else
+#define SLB_SPILLABLE(slbe) 0
+#endif
 
 void
 slb_spill(pmap_t pm, uint64_t esid, uint64_t vsid)