Merge branch 'linus' into x86/cleanups

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 7f8a2daa3fde..3ffed259883e 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -336,7 +336,6 @@ int devmem_is_allowed(unsigned long pagenr)
         return 0;
 }
 
-#ifdef CONFIG_HIGHMEM
 pte_t *kmap_pte;
 pgprot_t kmap_prot;
 
@@ -359,6 +358,7 @@ static void __init kmap_init(void)
         kmap_prot = PAGE_KERNEL;
 }
 
+#ifdef CONFIG_HIGHMEM
 static void __init permanent_kmaps_init(pgd_t *pgd_base)
 {
         unsigned long vaddr;
@@ -438,7 +438,6 @@ static void __init set_highmem_pages_init(void)
 #endif /* !CONFIG_NUMA */
 
 #else
-# define kmap_init()                            do { } while (0)
 # define permanent_kmaps_init(pgd_base)         do { } while (0)
 # define set_highmem_pages_init()       do { } while (0)
 #endif /* CONFIG_HIGHMEM */