From 4b9ff215fd5bd6741a6b288d07b33a29274cec69 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 26 Jul 2012 11:02:19 +0000
Subject: [PATCH] --- yaml --- r: 318948 b: refs/heads/master c:
 1b6d06d820df6822416270f46af57f5964137b42 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/sparc/include/asm/fixmap.h  | 26 --------------------------
 trunk/arch/sparc/include/asm/highmem.h |  1 -
 trunk/arch/sparc/include/asm/vaddrs.h  | 22 ++++++++++++++++++++++
 trunk/arch/sparc/mm/highmem.c          |  7 ++++---
 5 files changed, 27 insertions(+), 31 deletions(-)
 delete mode 100644 trunk/arch/sparc/include/asm/fixmap.h

diff --git a/[refs] b/[refs]
index 10be008d6936..c43f9738dac1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c00db32122e17120eb87d0f1f6723c1c4740fa78
+refs/heads/master: 1b6d06d820df6822416270f46af57f5964137b42
diff --git a/trunk/arch/sparc/include/asm/fixmap.h b/trunk/arch/sparc/include/asm/fixmap.h
deleted file mode 100644
index 0bdec9385a80..000000000000
--- a/trunk/arch/sparc/include/asm/fixmap.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Highmem related constants */
-
-#ifndef _ASM_FIXMAP_H
-#define _ASM_FIXMAP_H
-
-#include <asm/kmap_types.h>
-
-enum fixed_addresses {
-	FIX_HOLE,
-#ifdef CONFIG_HIGHMEM
-	FIX_KMAP_BEGIN,
-	FIX_KMAP_END = (KM_TYPE_NR * NR_CPUS),
-#endif
-	__end_of_fixed_addresses
-};
-
-/* Leave one empty page between IO pages at 0xfd000000 and
- * the top of the fixmap.
- */
-#define FIXADDR_TOP	(0xfcfff000UL)
-#define FIXADDR_SIZE	((FIX_KMAP_END + 1) << PAGE_SHIFT)
-#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)
-
-#define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
-
-#endif
diff --git a/trunk/arch/sparc/include/asm/highmem.h b/trunk/arch/sparc/include/asm/highmem.h
index a31b2a1f0866..639338353909 100644
--- a/trunk/arch/sparc/include/asm/highmem.h
+++ b/trunk/arch/sparc/include/asm/highmem.h
@@ -21,7 +21,6 @@
 #ifdef __KERNEL__
 
 #include <linux/interrupt.h>
-#include <asm/fixmap.h>
 #include <asm/vaddrs.h>
 #include <asm/kmap_types.h>
 #include <asm/pgtable.h>
diff --git a/trunk/arch/sparc/include/asm/vaddrs.h b/trunk/arch/sparc/include/asm/vaddrs.h
index da6535d88a72..c3dbcf902034 100644
--- a/trunk/arch/sparc/include/asm/vaddrs.h
+++ b/trunk/arch/sparc/include/asm/vaddrs.h
@@ -30,6 +30,28 @@
  */
 #define SRMMU_NOCACHE_ALCRATIO	64	/* 256 pages per 64MB of system RAM */
 
+#ifndef __ASSEMBLY__
+#include <asm/kmap_types.h>
+
+enum fixed_addresses {
+	FIX_HOLE,
+#ifdef CONFIG_HIGHMEM
+	FIX_KMAP_BEGIN,
+	FIX_KMAP_END = (KM_TYPE_NR * NR_CPUS),
+#endif
+	__end_of_fixed_addresses
+};
+#endif
+
+/* Leave one empty page between IO pages at 0xfd000000 and
+ * the top of the fixmap.
+ */
+#define FIXADDR_TOP		(0xfcfff000UL)
+#define FIXADDR_SIZE		((FIX_KMAP_END + 1) << PAGE_SHIFT)
+#define FIXADDR_START		(FIXADDR_TOP - FIXADDR_SIZE)
+
+#define __fix_to_virt(x)        (FIXADDR_TOP - ((x) << PAGE_SHIFT))
+
 #define SUN4M_IOBASE_VADDR	0xfd000000 /* Base for mapping pages */
 #define IOBASE_VADDR		0xfe000000
 #define IOBASE_END		0xfe600000
diff --git a/trunk/arch/sparc/mm/highmem.c b/trunk/arch/sparc/mm/highmem.c
index 856432a109d2..4d5f8b3c4090 100644
--- a/trunk/arch/sparc/mm/highmem.c
+++ b/trunk/arch/sparc/mm/highmem.c
@@ -22,13 +22,14 @@
  * shared by CPUs, and so precious, and establishing them requires IPI.
  * Atomic kmaps are lightweight and we may have NCPUS more of them.
  */
-#include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/export.h>
-#include <asm/pgalloc.h>
+#include <linux/mm.h>
+
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
-#include <asm/fixmap.h>
+#include <asm/pgalloc.h>
+#include <asm/vaddrs.h>
 
 void *kmap_atomic(struct page *page)
 {