From owner-p4-projects@FreeBSD.ORG  Thu Apr 17 00:53:51 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E19AC1065673; Thu, 17 Apr 2008 00:53: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 A41051065671
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 00:53:50 +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 780788FC1E
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 00:53:50 +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 m3H0roJ3003015
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 00:53:50 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H0ro6W003013
	for perforce@freebsd.org; Thu, 17 Apr 2008 00:53:50 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 17 Apr 2008 00:53:50 GMT
Message-Id: <200804170053.m3H0ro6W003013@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 140143 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 00:53:51 -0000

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

Change 140143 by marcel@marcel_xcllnt on 2008/04/17 00:53:05

	Fix merge botch.

Affected files ...

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

Differences ...

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

@@ -916,12 +916,6 @@
 	virtual_avail = VM_MIN_KERNEL_ADDRESS;
 	virtual_end = VM_MAX_KERNEL_ADDRESS;
 
-	moea_rkva_start = virtual_avail;
-	moea_rkva_count = 4;
-	virtual_avail += moea_rkva_count * PAGE_SIZE;
-
-	/*
-
 	/*
 	 * Set the start and end of kva.
 	 */