diff options
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 3 |
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) | |||
336 | return 0; | 336 | return 0; |
337 | } | 337 | } |
338 | 338 | ||
339 | #ifdef CONFIG_HIGHMEM | ||
340 | pte_t *kmap_pte; | 339 | pte_t *kmap_pte; |
341 | pgprot_t kmap_prot; | 340 | pgprot_t kmap_prot; |
342 | 341 | ||
@@ -359,6 +358,7 @@ static void __init kmap_init(void) | |||
359 | kmap_prot = PAGE_KERNEL; | 358 | kmap_prot = PAGE_KERNEL; |
360 | } | 359 | } |
361 | 360 | ||
361 | #ifdef CONFIG_HIGHMEM | ||
362 | static void __init permanent_kmaps_init(pgd_t *pgd_base) | 362 | static void __init permanent_kmaps_init(pgd_t *pgd_base) |
363 | { | 363 | { |
364 | unsigned long vaddr; | 364 | unsigned long vaddr; |
@@ -438,7 +438,6 @@ static void __init set_highmem_pages_init(void) | |||
438 | #endif /* !CONFIG_NUMA */ | 438 | #endif /* !CONFIG_NUMA */ |
439 | 439 | ||
440 | #else | 440 | #else |
441 | # define kmap_init() do { } while (0) | ||
442 | # define permanent_kmaps_init(pgd_base) do { } while (0) | 441 | # define permanent_kmaps_init(pgd_base) do { } while (0) |
443 | # define set_highmem_pages_init() do { } while (0) | 442 | # define set_highmem_pages_init() do { } while (0) |
444 | #endif /* CONFIG_HIGHMEM */ | 443 | #endif /* CONFIG_HIGHMEM */ |