diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-18 18:03:19 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-08 10:21:10 -0800 |
| commit | ee83348407722a76b2cabc6c6628c55876fd51e3 (patch) | |
| tree | 10f7b5e6c0fb56a8abe41721ed8c6a32ac1ed90e /arch | |
| parent | 22e633d1ba54044a66de913d164987f1fa946eea (diff) | |
kmap: fix build errors with DEBUG_HIGHMEM enabled
commit 4ff1fa278b0bd1b2dd3c42efc0cb86788ffe05d5 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/kmap_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h index d16ec97ec9a9..c019949a5189 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 |