From 2127edd2e4b37d0e5b88e5d8eed4f87e927f83da Mon Sep 17 00:00:00 2001
From: nwhitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 13 Jul 2010 05:32:19 +0000
Subject: MFppc64:

Kernel sources for 64-bit PowerPC, along with build-system changes to keep
32-bit kernels compiling (build system changes for 64-bit kernels are
coming later). Existing 32-bit PowerPC kernel configurations must be
updated after this change to specify their architecture.
---
 sys/powerpc/booke/locore.S     | 1 -
 sys/powerpc/booke/machdep.c    | 2 +-
 sys/powerpc/booke/swtch.S      | 1 -
 sys/powerpc/booke/vm_machdep.c | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'sys/powerpc/booke')

diff --git a/sys/powerpc/booke/locore.S b/sys/powerpc/booke/locore.S
index b5b5090..ae45baf 100644
--- a/sys/powerpc/booke/locore.S
+++ b/sys/powerpc/booke/locore.S
@@ -34,7 +34,6 @@
 #include <machine/hid.h>
 #include <machine/param.h>
 #include <machine/spr.h>
-#include <machine/psl.h>
 #include <machine/pte.h>
 #include <machine/trap.h>
 #include <machine/vmparam.h>
diff --git a/sys/powerpc/booke/machdep.c b/sys/powerpc/booke/machdep.c
index 038939f..070761e 100644
--- a/sys/powerpc/booke/machdep.c
+++ b/sys/powerpc/booke/machdep.c
@@ -208,7 +208,7 @@ cpu_e500_startup(void *dummy)
 		for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
 			size = phys_avail[indx + 1] - phys_avail[indx];
 
-			printf("0x%08x - 0x%08x, %d bytes (%d pages)\n",
+			printf("0x%08x - 0x%08x, %d bytes (%ld pages)\n",
 			    phys_avail[indx], phys_avail[indx + 1] - 1,
 			    size, size / PAGE_SIZE);
 		}
diff --git a/sys/powerpc/booke/swtch.S b/sys/powerpc/booke/swtch.S
index f7a9088..88cbf29 100644
--- a/sys/powerpc/booke/swtch.S
+++ b/sys/powerpc/booke/swtch.S
@@ -64,7 +64,6 @@
 
 #include <machine/trap.h>
 #include <machine/param.h>
-#include <machine/psl.h>
 #include <machine/asm.h>
 #include <machine/spr.h>
 
diff --git a/sys/powerpc/booke/vm_machdep.c b/sys/powerpc/booke/vm_machdep.c
index 5e7bde7..8d36793 100644
--- a/sys/powerpc/booke/vm_machdep.c
+++ b/sys/powerpc/booke/vm_machdep.c
@@ -380,7 +380,7 @@ is_physical_memory(vm_offset_t addr)
 }
 
 /*
- * Thread functions
+ * CPU threading functions related to VM.
  */
 
 void
-- 
cgit v1.1