From 2b887e8f5f820ea4e94b03d7363785f4cb974575 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 16 Nov 2012 19:39:10 -0800
Subject: [PATCH] --- yaml --- r: 356213 b: refs/heads/master c:
 c8dcdb9ce463ad4a660099a74a850f4f6fc81c41 h: refs/heads/master i:   356211:
 a718ceb50010aeb18e5944bfd2f1b064e7511018 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/x86/include/asm/init.h | 16 +++-------------
 trunk/arch/x86/mm/mm_internal.h   |  7 +++++++
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 7f72cfb744c4..e7e70226ab7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f836e35a98ab3b2f0d4c8730610e4a4a7f533505
+refs/heads/master: c8dcdb9ce463ad4a660099a74a850f4f6fc81c41
diff --git a/trunk/arch/x86/include/asm/init.h b/trunk/arch/x86/include/asm/init.h
index 626ea8d31b6d..bac770b7cbc4 100644
--- a/trunk/arch/x86/include/asm/init.h
+++ b/trunk/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/trunk/arch/x86/mm/mm_internal.h b/trunk/arch/x86/mm/mm_internal.h
index 7e3b88ee078a..dc79ac121774 100644
--- a/trunk/arch/x86/mm/mm_internal.h
+++ b/trunk/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 */