* [PATCH] x86: move free_initrd_mem() to common mm/init.c
@ 2009-03-04 9:13 Pekka Enberg
2009-03-04 20:01 ` [tip:x86/mm] " Pekka Enberg
0 siblings, 1 reply; 2+ messages in thread
From: Pekka Enberg @ 2009-03-04 9:13 UTC (permalink / raw)
To: mingo; +Cc: x86, linux-kernel
From: Pekka Enberg <penberg@cs.helsinki.fi>
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>
---
arch/x86/mm/init.c | 7 +++++++
arch/x86/mm/init_32.c | 7 -------
arch/x86/mm/init_64.c | 7 -------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index ce6a722..201bf4a 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -47,3 +47,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
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 0b087dc..d6bd5c4 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -1200,13 +1200,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)
{
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index aae8745..8df5919 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -983,13 +983,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)
{
--
1.5.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:x86/mm] x86: move free_initrd_mem() to common mm/init.c
2009-03-04 9:13 [PATCH] x86: move free_initrd_mem() to common mm/init.c Pekka Enberg
@ 2009-03-04 20:01 ` Pekka Enberg
0 siblings, 0 replies; 2+ messages in thread
From: Pekka Enberg @ 2009-03-04 20:01 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, penberg, tglx, mingo
Commit-ID: 731ddea63600c24ff01e6e5144cea88bf7266ac5
Gitweb: http://git.kernel.org/tip/731ddea63600c24ff01e6e5144cea88bf7266ac5
Author: "Pekka Enberg" <penberg@cs.helsinki.fi>
AuthorDate: Wed, 4 Mar 2009 11:13:40 +0200
Commit: Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 4 Mar 2009 20:59:26 +0100
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>
---
arch/x86/mm/init.c | 7 +++++++
arch/x86/mm/init_32.c | 7 -------
arch/x86/mm/init_64.c | 7 -------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index f89df52..cc7fe66 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -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
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 37aeaf3..c69c6b1 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -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)
{
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 074435e..d325186 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -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)
{
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-04 20:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-04 9:13 [PATCH] x86: move free_initrd_mem() to common mm/init.c Pekka Enberg
2009-03-04 20:01 ` [tip:x86/mm] " Pekka Enberg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.