From 1f7aa64c7c66beb29d1f8cada7b09781ff516e4a Mon Sep 17 00:00:00 2001
From: David Gibson <david@gibson.dropbear.id.au>
Date: Wed, 13 Jun 2007 14:52:56 +1000
Subject: [PATCH] --- yaml --- r: 60537 b: refs/heads/master c:
 c0770f686cf8f464b5b9d4bd28c1ed7604c97ed4 h: refs/heads/master i:   60535:
 67176cb2a60696ef15e1d00ca657ec7e4b4954c8 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/mm/pgtable_32.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index aec5cb3615fc..e247830b8de8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f21f49ea639ac3f24824177dac1268af75a2d373
+refs/heads/master: c0770f686cf8f464b5b9d4bd28c1ed7604c97ed4
diff --git a/trunk/arch/powerpc/mm/pgtable_32.c b/trunk/arch/powerpc/mm/pgtable_32.c
index 1c85c6f3bbba..64488723162a 100644
--- a/trunk/arch/powerpc/mm/pgtable_32.c
+++ b/trunk/arch/powerpc/mm/pgtable_32.c
@@ -36,7 +36,6 @@
 unsigned long ioremap_base;
 unsigned long ioremap_bot;
 EXPORT_SYMBOL(ioremap_bot);	/* aka VMALLOC_END */
-int io_bat_index;
 
 #if defined(CONFIG_6xx) || defined(CONFIG_POWER3)
 #define HAVE_BATS	1
@@ -299,9 +298,6 @@ void __init mapin_ram(void)
 	}
 }
 
-/* is x a power of 4? */
-#define is_power_of_4(x)	is_power_of_2(x) && (ffs(x) & 1)
-
 /* Scan the real Linux page tables and return a PTE pointer for
  * a virtual address in a context.
  * Returns true (1) if PTE was found, zero otherwise.  The pointer to