Skip to content

Commit

Permalink
x86: move free_initrd_mem() to common mm/init.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pekka Enberg authored and Ingo Molnar committed Mar 4, 2009
1 parent f624323 commit 731ddea
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
7 changes: 7 additions & 0 deletions arch/x86/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,10 @@ void free_initmem(void)
(unsigned long)(&__init_begin),
(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
7 changes: 0 additions & 7 deletions arch/x86/mm/init_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -1275,13 +1275,6 @@ void mark_rodata_ro(void)
}
#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 flags)
{
Expand Down
7 changes: 0 additions & 7 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -963,13 +963,6 @@ void mark_rodata_ro(void)

#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 flags)
{
Expand Down

0 comments on commit 731ddea

Please sign in to comment.