summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-11-16 19:39:10 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2012-11-17 11:59:38 -0800
commitc8dcdb9ce463ad4a660099a74a850f4f6fc81c41 (patch)
tree5c87d20f2a05e244ddd68ab57a99b1a0aa6a2b99
parentf836e35a98ab3b2f0d4c8730610e4a4a7f533505 (diff)
downloadlinux-0-day-c8dcdb9ce463ad4a660099a74a850f4f6fc81c41.tar.gz
linux-0-day-c8dcdb9ce463ad4a660099a74a850f4f6fc81c41.tar.xz
x86, mm: Move function declaration into mm_internal.h
They are only for mm/init*.c. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1353123563-3103-34-git-send-email-yinghai@kernel.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/include/asm/init.h16
-rw-r--r--arch/x86/mm/mm_internal.h7
2 files changed, 10 insertions, 13 deletions
diff --git a/arch/x86/include/asm/init.h b/arch/x86/include/asm/init.h
index 626ea8d31b6d1..bac770b7cbc4d 100644
--- a/arch/x86/include/asm/init.h
+++ b/arch/x86/include/asm/init.h
@@ -1,15 +1,5 @@
-#ifndef _ASM_X86_INIT_32_H
-#define _ASM_X86_INIT_32_H
+#ifndef _ASM_X86_INIT_H
+#define _ASM_X86_INIT_H
-#ifdef CONFIG_X86_32
-extern void __init early_ioremap_page_table_range_init(void);
-#endif
-extern void __init zone_sizes_init(void);
-
-extern unsigned long __init
-kernel_physical_mapping_init(unsigned long start,
- unsigned long end,
- unsigned long page_size_mask);
-
-#endif /* _ASM_X86_INIT_32_H */
+#endif /* _ASM_X86_INIT_H */
diff --git a/arch/x86/mm/mm_internal.h b/arch/x86/mm/mm_internal.h
index 7e3b88ee078aa..dc79ac1217740 100644
--- a/arch/x86/mm/mm_internal.h
+++ b/arch/x86/mm/mm_internal.h
@@ -7,4 +7,11 @@ static inline void *alloc_low_page(void)
return alloc_low_pages(1);
}
+void early_ioremap_page_table_range_init(void);
+
+unsigned long kernel_physical_mapping_init(unsigned long start,
+ unsigned long end,
+ unsigned long page_size_mask);
+void zone_sizes_init(void);
+
#endif /* __X86_MM_INTERNAL_H */