From owner-svn-src-head@FreeBSD.ORG  Sun Apr  5 21:52:14 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39913106564A;
	Sun,  5 Apr 2009 21:52:14 +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 275418FC15;
	Sun,  5 Apr 2009 21:52:14 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n35LqEf0035020;
	Sun, 5 Apr 2009 21:52:14 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n35LqEx7035019;
	Sun, 5 Apr 2009 21:52:14 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200904052152.n35LqEx7035019@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 5 Apr 2009 21:52:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190750 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Apr 2009 21:52:14 -0000

Author: nwhitehorn
Date: Sun Apr  5 21:52:13 2009
New Revision: 190750
URL: http://svn.freebsd.org/changeset/base/190750

Log:
  Fix the build when KDB is disabled. The second instance of rfi in
  trap_subr.S that is patched at runtime to rfid on 64-bit systems
  is inside KDB-specific code, so don't patch it without KDB.

Modified:
  head/sys/powerpc/aim/machdep.c

Modified: head/sys/powerpc/aim/machdep.c
==============================================================================
--- head/sys/powerpc/aim/machdep.c	Sun Apr  5 21:24:15 2009	(r190749)
+++ head/sys/powerpc/aim/machdep.c	Sun Apr  5 21:52:13 2009	(r190750)
@@ -383,7 +383,10 @@ powerpc_init(u_int startkernel, u_int en
 	if (ppc64) {
 		/* Patch the two instances of rfi -> rfid */
 		bcopy(&rfid_patch,&rfi_patch1,4);
+	#ifdef KDB
+		/* rfi_patch2 is at the end of dbleave */
 		bcopy(&rfid_patch,&rfi_patch2,4);
+	#endif
 
 		/*
 		 * Copy a code snippet to restore 32-bit bridge mode