From 262edc7f32b37a434032aebef2b92b2789f9e0f4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 10 Mar 2008 09:31:50 +0000
Subject: [PATCH] --- yaml --- r: 87191 b: refs/heads/master c:
 2ac7401d11370b7a8e3a1c74aac03a021fd61048 h: refs/heads/master i:   87189:
 d0768f857097321a74f062e7a845553b1279d193   87187:
 822308c1773dffed753a7a5650bc50f8d80ba508   87183:
 3830a38112f08215e5b348ab69576976b1f11bcd v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-mips/highmem.h    | 1 -
 trunk/include/asm-mips/pgtable-32.h | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 33454fc3a4cf..2d85c8705616 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 234fcd1484a66158b561b36b421547f0ab85fee9
+refs/heads/master: 2ac7401d11370b7a8e3a1c74aac03a021fd61048
diff --git a/trunk/include/asm-mips/highmem.h b/trunk/include/asm-mips/highmem.h
index 4d6bd5c31c7b..4374ab2adc75 100644
--- a/trunk/include/asm-mips/highmem.h
+++ b/trunk/include/asm-mips/highmem.h
@@ -39,7 +39,6 @@ extern pte_t *pkmap_page_table;
  * easily, subsequent pte tables have to be allocated in one physical
  * chunk of RAM.
  */
-#define PKMAP_BASE (0xfe000000UL)
 #define LAST_PKMAP 1024
 #define LAST_PKMAP_MASK (LAST_PKMAP-1)
 #define PKMAP_NR(virt)  ((virt-PKMAP_BASE) >> PAGE_SHIFT)
diff --git a/trunk/include/asm-mips/pgtable-32.h b/trunk/include/asm-mips/pgtable-32.h
index a0947092d0e0..ceefe027c761 100644
--- a/trunk/include/asm-mips/pgtable-32.h
+++ b/trunk/include/asm-mips/pgtable-32.h
@@ -65,6 +65,8 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
 
 #define VMALLOC_START     MAP_BASE
 
+#define PKMAP_BASE		(0xfe000000UL)
+
 #ifdef CONFIG_HIGHMEM
 # define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
 #else