From de33fc4d46dc791e0684d28f4f1aba726772e0b6 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 26 Jul 2012 11:02:27 +0000
Subject: [PATCH] --- yaml --- r: 318956 b: refs/heads/master c:
 9a4d5b93cb67b63d896579f416109274235a7a65 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/sparc/include/asm/highmem.h |  1 -
 trunk/arch/sparc/mm/highmem.c          | 17 +++++++++++++++++
 trunk/arch/sparc/mm/init_32.c          | 13 -------------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index f0b1f08ca12a..7dd657cc7af5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8a1b2b94ca5fe219b3c77389e2424145c24c668
+refs/heads/master: 9a4d5b93cb67b63d896579f416109274235a7a65
diff --git a/trunk/arch/sparc/include/asm/highmem.h b/trunk/arch/sparc/include/asm/highmem.h
index 639338353909..4f9e15c757e2 100644
--- a/trunk/arch/sparc/include/asm/highmem.h
+++ b/trunk/arch/sparc/include/asm/highmem.h
@@ -28,7 +28,6 @@
 /* declarations for highmem.c */
 extern unsigned long highstart_pfn, highend_pfn;
 
-extern pte_t *kmap_pte;
 extern pgprot_t kmap_prot;
 extern pte_t *pkmap_page_table;
 
diff --git a/trunk/arch/sparc/mm/highmem.c b/trunk/arch/sparc/mm/highmem.c
index 4d5f8b3c4090..449f864f0cef 100644
--- a/trunk/arch/sparc/mm/highmem.c
+++ b/trunk/arch/sparc/mm/highmem.c
@@ -31,6 +31,23 @@
 #include <asm/pgalloc.h>
 #include <asm/vaddrs.h>
 
+pgprot_t kmap_prot;
+
+static pte_t *kmap_pte;
+
+void __init kmap_init(void)
+{
+	unsigned long address;
+	pmd_t *dir;
+
+	address = __fix_to_virt(FIX_KMAP_BEGIN);
+	dir = pmd_offset(pgd_offset_k(address), address);
+
+        /* cache the first kmap pte */
+        kmap_pte = pte_offset_kernel(dir, address);
+        kmap_prot = __pgprot(SRMMU_ET_PTE | SRMMU_PRIV | SRMMU_CACHE);
+}
+
 void *kmap_atomic(struct page *page)
 {
 	unsigned long vaddr;
diff --git a/trunk/arch/sparc/mm/init_32.c b/trunk/arch/sparc/mm/init_32.c
index 020d2afa0030..9f1162fbad37 100644
--- a/trunk/arch/sparc/mm/init_32.c
+++ b/trunk/arch/sparc/mm/init_32.c
@@ -52,19 +52,6 @@ extern unsigned int sparc_ramdisk_size;
 
 unsigned long highstart_pfn, highend_pfn;
 
-pte_t *kmap_pte;
-pgprot_t kmap_prot;
-
-#define kmap_get_fixmap_pte(vaddr) \
-	pte_offset_kernel(pmd_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr))
-
-void __init kmap_init(void)
-{
-	/* cache the first kmap pte */
-	kmap_pte = kmap_get_fixmap_pte(__fix_to_virt(FIX_KMAP_BEGIN));
-	kmap_prot = __pgprot(SRMMU_ET_PTE | SRMMU_PRIV | SRMMU_CACHE);
-}
-
 void show_mem(unsigned int filter)
 {
 	printk("Mem-info:\n");