summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-03-17 15:47:14 -0700
committerThomas Gleixner <tglx@linutronix.de>2010-03-17 15:47:14 -0700
commite89fab2bf44afccaa48ffb8ae33c03f4f3dcd208 (patch)
treee3d5f8c0e688f67c615989e99d5ecc27b358e17d
parent791d920bdb9a32321b53f681432b34f3b331df4f (diff)
downloadlwn-e89fab2bf44afccaa48ffb8ae33c03f4f3dcd208.tar.gz
lwn-e89fab2bf44afccaa48ffb8ae33c03f4f3dcd208.zip
x86: Fix the highmem fallout really
Bah, forgot to fix iomap_32.c along with the Kconfig Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/mm/iomap_32.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
index c889badeda5c..d4fe51ac86f2 100644
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
@@ -97,8 +97,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type)
}
EXPORT_SYMBOL(__kunmap_atomic);
-
-#ifndef CONFIG_PREEMPT_RT
+#if !defined(CONFIG_PREEMPT_RT) || defined(CONFIG_HIGHMEM)
# ifndef CONFIG_HIGHMEM
# define kmap_atomic_prot_pfn(pfn, type, prot) \