From owner-p4-projects@FreeBSD.ORG  Sun Apr 27 23:43:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B979D1065675; Sun, 27 Apr 2008 23:43:15 +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 7A1FA1065672
	for <perforce@freebsd.org>; Sun, 27 Apr 2008 23:43:15 +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 61AEB8FC0A
	for <perforce@freebsd.org>; Sun, 27 Apr 2008 23:43:15 +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 m3RNhFlp021909
	for <perforce@freebsd.org>; Sun, 27 Apr 2008 23:43:15 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3RNhFg9021907
	for perforce@freebsd.org; Sun, 27 Apr 2008 23:43:15 GMT
	(envelope-from marcel@freebsd.org)
Date: Sun, 27 Apr 2008 23:43:15 GMT
Message-Id: <200804272343.m3RNhFg9021907@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 140768 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: Sun, 27 Apr 2008 23:43:16 -0000

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

Change 140768 by marcel@marcel_xcllnt on 2008/04/27 23:42:45

	Fix merge botch.

Affected files ...

.. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#6 edit

Differences ...

==== //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#6 (text+ko) ====

@@ -230,16 +230,6 @@
 
 #ifdef SMP
 /*
- */
-	.data
-	.align	4
-GLOBAL(dbstk)
-	.space	INTSTK+8			/* kdb stack */
-#endif
-
-	.text
-
-/*
  * Processor reset exception handler. These are typically
  * the first instructions the processor executes after a
  * software reset.
@@ -292,6 +282,7 @@
 9:
 	b	9b
 CNAME(rstsize) = . - CNAME(rstcode)
+#endif
 
 /*
  * This code gets copied to all the trap vectors