From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 18 Nov 2009 18:03:19 +0000 (+0000)
Subject: [ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
X-Git-Tag: v2.6.32~36^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ff1fa278b0bd1b2dd3c42efc0cb86788ffe05d5;p=thirdparty%2Flinux.git

[ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled

d451564 broke ARM by requiring KM_IRQ_PTE, KM_NMI and KM_NMI_PTE to
always be defined.  Solve this by providing invalid definitions for
these constants, but only if CONFIG_DEBUG_HIGHMEM is enabled.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
index d16ec97ec9a99..c019949a5189d 100644
--- a/arch/arm/include/asm/kmap_types.h
+++ b/arch/arm/include/asm/kmap_types.h
@@ -22,4 +22,10 @@ enum km_type {
 	KM_TYPE_NR
 };
 
+#ifdef CONFIG_DEBUG_HIGHMEM
+#define KM_NMI		(-1)
+#define KM_NMI_PTE	(-1)
+#define KM_IRQ_PTE	(-1)
+#endif
+
 #endif