From owner-svn-src-all@FreeBSD.ORG  Fri Nov  6 06:09:06 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F053106566C;
	Fri,  6 Nov 2009 06:09:06 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E0808FC08;
	Fri,  6 Nov 2009 06:09:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA66952K004667;
	Fri, 6 Nov 2009 06:09:05 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA6695t4004666;
	Fri, 6 Nov 2009 06:09:05 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200911060609.nA6695t4004666@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 6 Nov 2009 06:09:04 +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: r198968 - head/sys/powerpc/powerpc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Nov 2009 06:09:06 -0000

Author: marcel
Date: Fri Nov  6 06:09:04 2009
New Revision: 198968
URL: http://svn.freebsd.org/changeset/base/198968

Log:
  Unbreak E500 builds. The inline assembly for the 970 CPUs
  is invalid when compiling for BookE.

Modified:
  head/sys/powerpc/powerpc/cpu.c

Modified: head/sys/powerpc/powerpc/cpu.c
==============================================================================
--- head/sys/powerpc/powerpc/cpu.c	Fri Nov  6 01:11:59 2009	(r198967)
+++ head/sys/powerpc/powerpc/cpu.c	Fri Nov  6 06:09:04 2009	(r198968)
@@ -118,7 +118,9 @@ static void	cpu_print_speed(void);
 static void	cpu_6xx_setup(int cpuid, uint16_t vers);
 static void	cpu_6xx_print_cacheinfo(u_int, uint16_t);
 static void	cpu_e500_setup(int cpuid, uint16_t vers);
+#ifndef E500
 static void	cpu_970_setup(int cpuid, uint16_t vers);
+#endif
 
 void
 cpu_setup(u_int cpuid)
@@ -195,12 +197,14 @@ cpu_setup(u_int cpuid)
 			cpu_6xx_setup(cpuid, vers);
 			break;
 
+#ifndef E500
 		case IBM970:
 		case IBM970FX:
 		case IBM970GX:
 		case IBM970MP:
 			cpu_970_setup(cpuid, vers);
 			break;
+#endif
 
 		case FSL_E500v1:
 		case FSL_E500v2:
@@ -429,6 +433,7 @@ cpu_e500_setup(int cpuid, uint16_t vers)
 	printf("cpu%d: HID0 %b", cpuid, (int)hid0, HID0_E500_BITMASK);
 }
 
+#ifndef E500
 static void
 cpu_970_setup(int cpuid, uint16_t vers)
 {
@@ -458,4 +463,4 @@ cpu_970_setup(int cpuid, uint16_t vers)
 	    : "=r" (hid0_hi) : "K" (SPR_HID0));
 	printf("cpu%d: HID0 %b", cpuid, (int)(hid0_hi), HID0_970_BITMASK);
 }
-
+#endif