From owner-svn-src-all@FreeBSD.ORG  Mon Nov 12 06:15:55 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5F162578;
 Mon, 12 Nov 2012 06:15:55 +0000 (UTC)
 (envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4516F8FC0C;
 Mon, 12 Nov 2012 06:15:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAC6FtqO066503;
 Mon, 12 Nov 2012 06:15:55 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAC6FtVD066502;
 Mon, 12 Nov 2012 06:15:55 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201211120615.qAC6FtVD066502@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 12 Nov 2012 06:15:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242904 - head/sys/powerpc/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 12 Nov 2012 06:15:55 -0000

Author: rpaulo
Date: Mon Nov 12 06:15:54 2012
New Revision: 242904
URL: http://svnweb.freebsd.org/changeset/base/242904

Log:
  Allow this file to be used in LOCORE sections of the kernel.

Modified:
  head/sys/powerpc/include/bat.h

Modified: head/sys/powerpc/include/bat.h
==============================================================================
--- head/sys/powerpc/include/bat.h	Mon Nov 12 00:30:40 2012	(r242903)
+++ head/sys/powerpc/include/bat.h	Mon Nov 12 06:15:54 2012	(r242904)
@@ -71,10 +71,12 @@
 #ifndef	_MACHINE_BAT_H_
 #define	_MACHINE_BAT_H_
 
+#ifndef LOCORE
 struct bat {
 	u_int32_t batu;
 	u_int32_t batl;
 };
+#endif
 
 /* Lower BAT bits (all but PowerPC 601): */
 #define	BAT_PBS		0xfffe0000	/* physical block start */
@@ -165,7 +167,7 @@ struct bat {
 #define	BATL601(pa, size, v)						\
 	(((pa) & BAT601_PBN) | (v) | (size))
 
-#ifdef _KERNEL
+#if defined(_KERNEL) && !defined(LOCORE)
 extern struct bat battable[16];
 #endif