diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-03-03 07:10:12 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-03 07:13:15 -0500 |
commit | 867c5b5292583b1e474cbbcb4c77f09bfca3903c (patch) | |
tree | 44b0d467ce71aa7a68ef5fcb2b256555fa664f4b /arch/x86/mm/init_32.c | |
parent | e5b2bb552706ca0e30795ee84caacbb37cec5705 (diff) |
x86: set_highmem_pages_init() cleanup
Impact: cleanup
This patch moves set_highmem_pages_init() to arch/x86/mm/highmem_32.c.
The declaration of the function is kept in asm/numa_32.h because
asm/highmem.h is included only if CONFIG_HIGHMEM is enabled so we
can't put the empty static inline function there.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236082212.2675.24.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index cd8d67326138..0b087dcd2c18 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -467,22 +467,10 @@ void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn, | |||
467 | work_with_active_regions(nid, add_highpages_work_fn, &data); | 467 | work_with_active_regions(nid, add_highpages_work_fn, &data); |
468 | } | 468 | } |
469 | 469 | ||
470 | #ifndef CONFIG_NUMA | ||
471 | static void __init set_highmem_pages_init(void) | ||
472 | { | ||
473 | add_highpages_with_active_regions(0, highstart_pfn, highend_pfn); | ||
474 | |||
475 | totalram_pages += totalhigh_pages; | ||
476 | } | ||
477 | #endif /* !CONFIG_NUMA */ | ||
478 | |||
479 | #else | 470 | #else |
480 | static inline void permanent_kmaps_init(pgd_t *pgd_base) | 471 | static inline void permanent_kmaps_init(pgd_t *pgd_base) |
481 | { | 472 | { |
482 | } | 473 | } |
483 | static inline void set_highmem_pages_init(void) | ||
484 | { | ||
485 | } | ||
486 | #endif /* CONFIG_HIGHMEM */ | 474 | #endif /* CONFIG_HIGHMEM */ |
487 | 475 | ||
488 | void __init native_pagetable_setup_start(pgd_t *base) | 476 | void __init native_pagetable_setup_start(pgd_t *base) |