Browse Source

x86: move free_initrd_mem() to common mm/init.c

Impact: cleanup

The function is identical on 32-bit and 64-bit configurations so move it to the
common mm/init.c file.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236158020.29024.28.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Pekka Enberg 16 years ago
parent
commit
731ddea636
3 changed files with 7 additions and 14 deletions
  1. 7 0
      arch/x86/mm/init.c
  2. 0 7
      arch/x86/mm/init_32.c
  3. 0 7
      arch/x86/mm/init_64.c

+ 7 - 0
arch/x86/mm/init.c

@@ -71,3 +71,10 @@ void free_initmem(void)
 			(unsigned long)(&__init_begin),
 			(unsigned long)(&__init_begin),
 			(unsigned long)(&__init_end));
 			(unsigned long)(&__init_end));
 }
 }
+
+#ifdef CONFIG_BLK_DEV_INITRD
+void free_initrd_mem(unsigned long start, unsigned long end)
+{
+	free_init_pages("initrd memory", start, end);
+}
+#endif

+ 0 - 7
arch/x86/mm/init_32.c

@@ -1275,13 +1275,6 @@ void mark_rodata_ro(void)
 }
 }
 #endif
 #endif
 
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-	free_init_pages("initrd memory", start, end);
-}
-#endif
-
 int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
 int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
 				   int flags)
 				   int flags)
 {
 {

+ 0 - 7
arch/x86/mm/init_64.c

@@ -963,13 +963,6 @@ void mark_rodata_ro(void)
 
 
 #endif
 #endif
 
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-	free_init_pages("initrd memory", start, end);
-}
-#endif
-
 int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
 int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
 				   int flags)
 				   int flags)
 {
 {