From owner-p4-projects@FreeBSD.ORG  Thu Apr 17 01:49:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 163471065670; Thu, 17 Apr 2008 01:49:50 +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 CC472106566C
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 01:49:49 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B95818FC0A
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 01:49:49 +0000 (UTC)
	(envelope-from marcel@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 m3H1nnPF007543
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 01:49:49 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H1nnfv007541
	for perforce@freebsd.org; Thu, 17 Apr 2008 01:49:49 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 17 Apr 2008 01:49:49 GMT
Message-Id: <200804170149.m3H1nnfv007541@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140147 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: Thu, 17 Apr 2008 01:49:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=140147

Change 140147 by marcel@marcel_xcllnt on 2008/04/17 01:49:29

	More merge botches...

Affected files ...

.. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#5 edit

Differences ...

==== //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#5 (text+ko) ====

@@ -894,18 +894,6 @@
 	kernel_pmap->pm_active = ~0;
 
 	pmap_cpu_bootstrap(trace, 0);
-	/*
-	 * Initialize hardware.
-	 */
-	for (i = 0; i < 16; i++) {
-		mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT);
-	}
-	__asm __volatile ("mtsr %0,%1"
-	    :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT));
-	__asm __volatile ("mtsr %0,%1"
-	    :: "n"(KERNEL2_SR), "r"(KERNEL2_SEGMENT));
-	__asm __volatile ("sync; mtsdr1 %0; isync"
-	    :: "r"((u_int)moea_pteg_table | (moea_pteg_mask >> 10)));
 	tlbia();
 
 	pmap_bootstrapped++;
@@ -917,12 +905,6 @@
 	virtual_end = VM_MAX_KERNEL_ADDRESS;
 
 	/*
-	 * Set the start and end of kva.
-	 */
-	virtual_avail = VM_MIN_KERNEL_ADDRESS;
-	virtual_end = VM_MAX_KERNEL_ADDRESS;
-
-	/*
 	 * Allocate a kernel stack with a guard page for thread0 and map it
 	 * into the kernel page map.
 	 */