From 785b5de4871a6f158bb08c1cb58885b91aebc78a Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Fri, 16 Oct 2009 07:05:17 +0000
Subject: [PATCH] --- yaml --- r: 167867 b: refs/heads/master c:
 ce7a35c73a308c62f9f0ca9f0821ebe0dc553008 h: refs/heads/master i:   167865:
 b0d82986bfebae33fab9b7a4d8479478e6da6ee0   167863:
 e440dd2dc1c05d0b07a4524360e0fa4fdd550f0f v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/pci_64.c   | 2 ++
 trunk/arch/powerpc/kernel/process.c  | 2 +-
 trunk/arch/powerpc/kernel/setup_64.c | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 574afe6ded78..ccd0dbd5d766 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fafbe983d9fe723caa4ee1899663ed4c2d19ed3b
+refs/heads/master: ce7a35c73a308c62f9f0ca9f0821ebe0dc553008
diff --git a/trunk/arch/powerpc/kernel/pci_64.c b/trunk/arch/powerpc/kernel/pci_64.c
index ba949a2c93ac..ccf56ac92de5 100644
--- a/trunk/arch/powerpc/kernel/pci_64.c
+++ b/trunk/arch/powerpc/kernel/pci_64.c
@@ -97,7 +97,9 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
 	 * to do an appropriate TLB flush here too
 	 */
 	if (bus->self) {
+#ifdef CONFIG_PPC_STD_MMU_64
 		struct resource *res = bus->resource[0];
+#endif
 
 		pr_debug("IO unmapping for PCI-PCI bridge %s\n",
 			 pci_name(bus->self));
diff --git a/trunk/arch/powerpc/kernel/process.c b/trunk/arch/powerpc/kernel/process.c
index 2ec1eaed19ca..c930ac38e59f 100644
--- a/trunk/arch/powerpc/kernel/process.c
+++ b/trunk/arch/powerpc/kernel/process.c
@@ -1172,7 +1172,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
 	unsigned long base = mm->brk;
 	unsigned long ret;
 
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_STD_MMU_64
 	/*
 	 * If we are using 1TB segments and we are allowed to randomise
 	 * the heap, we can put it above 1TB so it is backed by a 1TB
diff --git a/trunk/arch/powerpc/kernel/setup_64.c b/trunk/arch/powerpc/kernel/setup_64.c
index 797ea95aae2e..04f638d82fb3 100644
--- a/trunk/arch/powerpc/kernel/setup_64.c
+++ b/trunk/arch/powerpc/kernel/setup_64.c
@@ -57,7 +57,6 @@
 #include <asm/cache.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
-#include <asm/mmu-hash64.h>
 #include <asm/firmware.h>
 #include <asm/xmon.h>
 #include <asm/udbg.h>