From owner-p4-projects@FreeBSD.ORG  Thu Mar 13 03:58:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7AD561065673; Thu, 13 Mar 2008 03:58:01 +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 3A8FA1065672
	for <perforce@freebsd.org>; Thu, 13 Mar 2008 03:58:01 +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 241DE8FC1B
	for <perforce@freebsd.org>; Thu, 13 Mar 2008 03:58:01 +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 m2D3w1Cd059496
	for <perforce@freebsd.org>; Thu, 13 Mar 2008 03:58:01 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D3w0N2059494
	for perforce@freebsd.org; Thu, 13 Mar 2008 03:58:00 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 13 Mar 2008 03:58:00 GMT
Message-Id: <200803130358.m2D3w0N2059494@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 137570 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, 13 Mar 2008 03:58:01 -0000

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

Change 137570 by marcel@marcel_xcllnt on 2008/03/13 03:57:24

	Catch up with BookE support.

Affected files ...

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

Differences ...

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

@@ -174,9 +174,9 @@
 			break;
 
 		case EXC_DSI:
-			if (frame->dsisr & DSISR_DABR) {
+			if (frame->cpu.aim.dsisr & DSISR_DABR) {
 				td->td_pcb->pcb_wppc = frame->srr0;
-				frame->dar = td->td_pcb->pcb_dabr & ~7;
+				frame->cpu.aim.dar = td->td_pcb->pcb_dabr & ~7;
 				sig = SIGTRAP;
 				break;
 			}