Move all declarations of free_initmem() to linux/mm.h

Move all declarations of free_initmem() to linux/mm.h so that there's only one
and it's used by everything.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-c6x-dev@linux-c6x.org
cc: microblaze-uclinux@itee.uq.edu.au
cc: linux-sh@vger.kernel.org
cc: sparclinux@vger.kernel.org
cc: x86@kernel.org
cc: linux-mm@kvack.org

diff --git a/arch/c6x/include/asm/system.h b/arch/c6x/include/asm/system.h
index ccc4f86d16c5f750bc295b92957056a0c5a20794..0d84f9e42fdec79dc4f1b52f82ac5b44d3643839 100644 (file)
--- a/arch/c6x/include/asm/system.h
+++ b/arch/c6x/include/asm/system.h
@@ -4,4 +4,3 @@
 #include <asm/exec.h>
 #include <asm/special_insns.h>
 #include <asm/switch_to.h>
-extern void free_initmem(void);

diff --git a/arch/frv/include/asm/system.h b/arch/frv/include/asm/system.h
index 5c707a2354039d0c17151bfab0b47499db1e4cb1..659bcdb44ecadf3ffa5aa5234ef8693ccb48e1ba 100644 (file)
--- a/arch/frv/include/asm/system.h
+++ b/arch/frv/include/asm/system.h
@@ -1,6 +1,4 @@
-/* FILE TO BE DELETED. DO NOT ADD STUFF HERE! */
 #include <asm/barrier.h>
 #include <asm/cmpxchg.h>
 #include <asm/exec.h>
 #include <asm/switch_to.h>
-extern void free_initmem(void);

diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h
index ccc4f86d16c5f750bc295b92957056a0c5a20794..0d84f9e42fdec79dc4f1b52f82ac5b44d3643839 100644 (file)
--- a/arch/microblaze/include/asm/system.h
+++ b/arch/microblaze/include/asm/system.h
@@ -4,4 +4,3 @@
 #include <asm/exec.h>
 #include <asm/special_insns.h>
 #include <asm/switch_to.h>
-extern void free_initmem(void);

diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
index e2042aa32f2c5c8aae2ea410a02abeddabf9fc90..04268aa3b3e54783d4cca287612b4d0f5b73fa85 100644 (file)
--- a/arch/sh/include/asm/system.h
+++ b/arch/sh/include/asm/system.h
@@ -6,4 +6,3 @@
 #include <asm/exec.h>
 #include <asm/switch_to.h>
 #include <asm/traps.h>
-void free_initmem(void);

diff --git a/arch/sparc/mm/init_64.h b/arch/sparc/mm/init_64.h
index 77d1b313e3441e9b616dffeed881b7cf5bfcc541..3e1ac8b96cae092017d57b5f6c1eb2023dc72af1 100644 (file)
--- a/arch/sparc/mm/init_64.h
+++ b/arch/sparc/mm/init_64.h
@@ -36,8 +36,6 @@ extern unsigned long kern_locked_tte_data;
 
 extern void prom_world(int enter);
 
-extern void free_initmem(void);
-
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
 #define VMEMMAP_CHUNK_SHIFT    22
 #define VMEMMAP_CHUNK          (1UL << VMEMMAP_CHUNK_SHIFT)

diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index bce688d54c12383e29b360bb7688b3fc9d385830..e21fdd10479f88e339e1e7351da837c563361635 100644 (file)
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -55,7 +55,6 @@ extern unsigned long init_memory_mapping(unsigned long start,
                                         unsigned long end);
 
 extern void initmem_init(void);
-extern void free_initmem(void);
 
 #endif /* !__ASSEMBLY__ */
 

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7330742e797325e6c55c3c3027518e6ed7e53aeb..69f6d7b7eb019d420eef1249c4c36638c5aeeb6a 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1257,6 +1257,8 @@ static inline void pgtable_page_dtor(struct page *page)
 extern void free_area_init(unsigned long * zones_size);
 extern void free_area_init_node(int nid, unsigned long * zones_size,
                unsigned long zone_start_pfn, unsigned long *zholes_size);
+extern void free_initmem(void);
+
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
 /*
  * With CONFIG_HAVE_MEMBLOCK_NODE_MAP set, an architecture may initialise its

diff --git a/init/main.c b/init/main.c
index c24805c824b981d92b134e84792b66b515b0ef46..44c9754e2a5ccf07772618f6fb157ea61dccb36e 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -87,7 +87,6 @@ extern void mca_init(void);
 extern void sbus_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
-extern void free_initmem(void);
 #ifndef CONFIG_DEBUG_RODATA
 static inline void mark_rodata_ro(void) { }
 #endif