From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 21 Jan 2010 07:16:36 +0000 (+0900)
Subject: sh: Conserve fixmap slots when IOREMAP_FIXED=n.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a077e91690fb32a1453423b2cf1df3492fd30c3a;p=deliverable%2Flinux.git

sh: Conserve fixmap slots when IOREMAP_FIXED=n.

Presently the IOREMAP_FIXED fixmaps are always defined, even if the
platform isn't capable of supporting it. Since we already have an ifdef
for it, ifdef the entries, too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/include/asm/fixmap.h b/arch/sh/include/asm/fixmap.h
index 17b22b6c1001..6e7cea453895 100644
--- a/arch/sh/include/asm/fixmap.h
+++ b/arch/sh/include/asm/fixmap.h
@@ -61,6 +61,7 @@ enum fixed_addresses {
 	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
 #endif
 
+#ifdef CONFIG_IOREMAP_FIXED
 	/*
 	 * FIX_IOREMAP entries are useful for mapping physical address
 	 * space before ioremap() is useable, e.g. really early in boot
@@ -69,6 +70,7 @@ enum fixed_addresses {
 #define FIX_N_IOREMAPS	32
 	FIX_IOREMAP_BEGIN,
 	FIX_IOREMAP_END = FIX_IOREMAP_BEGIN + FIX_N_IOREMAPS,
+#endif
 
 	__end_of_fixed_addresses
 };