PERFORCE change 136730 for review

[Rafal Jaworowski]

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

Change 136730 by raj at raj_mimi on 2008/03/03 12:16:30

	Prepare headers before the CVS import.

Affected files ...

.. //depot/projects/e500/sys/powerpc/include/pmap.h#5 edit
.. //depot/projects/e500/sys/powerpc/include/tlb.h#3 edit
.. //depot/projects/e500/sys/powerpc/include/trap.h#6 edit
.. //depot/projects/e500/sys/powerpc/include/trap_booke.h#2 edit
.. //depot/projects/e500/sys/powerpc/include/vmparam.h#8 edit
.. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.h#4 edit

Differences ...

==== //depot/projects/e500/sys/powerpc/include/pmap.h#5 (text+ko) ====

@@ -25,6 +25,8 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.20 2006/12/05 04:01:52 grehan Exp $
  */
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -56,8 +58,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: pmap.h,v 1.17 2000/03/30 16:18:24 jdolecek Exp $
- * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.20 2006/12/05 04:01:52 grehan Exp $
+ *	from: $NetBSD: pmap.h,v 1.17 2000/03/30 16:18:24 jdolecek Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_

==== //depot/projects/e500/sys/powerpc/include/tlb.h#3 (text+ko) ====

@@ -23,6 +23,8 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_TLB_H_

==== //depot/projects/e500/sys/powerpc/include/trap.h#6 (text+ko) ====

@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 #if defined(AIM)
 #include <machine/trap_aim.h>
 #elif defined(E500)

==== //depot/projects/e500/sys/powerpc/include/trap_booke.h#2 (text+ko) ====

@@ -23,8 +23,13 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
+#ifndef	_POWERPC_TRAP_H_
+#define	_POWERPC_TRAP_H_
+
 #define	EXC_CRIT	0
 #define	EXC_MCHK	1
 #define	EXC_DSI		2
@@ -46,3 +51,5 @@
 #define	EXC_PERF	35	/* e500-specific: Performance monitor */
 
 #define	EXC_LAST	255
+
+#endif	/* _POWERPC_TRAP_H_ */

==== //depot/projects/e500/sys/powerpc/include/vmparam.h#8 (text+ko) ====

@@ -111,8 +111,8 @@
 /*
  * Kernel CCSRBAR location. We make this the reset location.
  */
-#define CCSRBAR_VA              0xfef00000
-#define CCSRBAR_SIZE            0x00100000
+#define	CCSRBAR_VA		0xfef00000
+#define	CCSRBAR_SIZE		0x00100000
 
 #define	KERNBASE		0xc0000000	/* start of kernel virtual */
 

==== //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.h#4 (text+ko) ====

@@ -24,7 +24,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $FreeBSD$
  */
+
 #ifndef _MACHINE_OCP85XX_H_
 #define _MACHINE_OCP85XX_H_