diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-11-16 22:39:17 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-11-17 14:59:45 -0500 |
commit | 60a8f428320918458a9a21052777eada68eebfd8 (patch) | |
tree | 5d20d88a6a287ad3a17fe20ec414f59912acc2a3 | |
parent | 4e37a890474b89ca49ad6b3651b1709a17d7c216 (diff) |
x86, mm: Move after_bootmem to mm_internel.h
it is only used in arch/x86/mm/init*.c
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-41-git-send-email-yinghai@kernel.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r-- | arch/x86/mm/mm_internal.h | 2 | ||||
-rw-r--r-- | include/linux/mm.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/mm_internal.h b/arch/x86/mm/mm_internal.h index dc79ac121774..6b563a118891 100644 --- a/arch/x86/mm/mm_internal.h +++ b/arch/x86/mm/mm_internal.h | |||
@@ -14,4 +14,6 @@ unsigned long kernel_physical_mapping_init(unsigned long start, | |||
14 | unsigned long page_size_mask); | 14 | unsigned long page_size_mask); |
15 | void zone_sizes_init(void); | 15 | void zone_sizes_init(void); |
16 | 16 | ||
17 | extern int after_bootmem; | ||
18 | |||
17 | #endif /* __X86_MM_INTERNAL_H */ | 19 | #endif /* __X86_MM_INTERNAL_H */ |
diff --git a/include/linux/mm.h b/include/linux/mm.h index bcaab4e6fe91..64d5271a3d36 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1355,7 +1355,6 @@ extern void __init mmap_init(void); | |||
1355 | extern void show_mem(unsigned int flags); | 1355 | extern void show_mem(unsigned int flags); |
1356 | extern void si_meminfo(struct sysinfo * val); | 1356 | extern void si_meminfo(struct sysinfo * val); |
1357 | extern void si_meminfo_node(struct sysinfo *val, int nid); | 1357 | extern void si_meminfo_node(struct sysinfo *val, int nid); |
1358 | extern int after_bootmem; | ||
1359 | 1358 | ||
1360 | extern __printf(3, 4) | 1359 | extern __printf(3, 4) |
1361 | void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...); | 1360 | void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...); |