From: "Jan Beulich" <JBeulich@novell.com>
Besides freeing initrd memory, also clear out the now dangling pointers to
it, to make sure accidental late use attempts can be detected.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
init/initramfs.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff -puN init/initramfs.c~free-initrd-mem-adjustment init/initramfs.c
--- 25/init/initramfs.c~free-initrd-mem-adjustment Fri Sep 9 17:00:57 2005
+++ 25-akpm/init/initramfs.c Fri Sep 9 17:00:57 2005
@@ -466,6 +466,14 @@ static char * __init unpack_to_rootfs(ch
extern char __initramfs_start[], __initramfs_end[];
#ifdef CONFIG_BLK_DEV_INITRD
#include <linux/initrd.h>
+
+static inline void __init free_initrd(void)
+{
+ free_initrd_mem(initrd_start, initrd_end);
+ initrd_start = 0;
+ initrd_end = 0;
+}
+
#endif
void __init populate_rootfs(void)
@@ -484,7 +492,7 @@ void __init populate_rootfs(void)
printk(" it is\n");
unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start, 0);
- free_initrd_mem(initrd_start, initrd_end);
+ free_initrd();
return;
}
printk("it isn't (%s); looks like an initrd\n", err);
@@ -493,7 +501,7 @@ void __init populate_rootfs(void)
sys_write(fd, (char *)initrd_start,
initrd_end - initrd_start);
sys_close(fd);
- free_initrd_mem(initrd_start, initrd_end);
+ free_initrd();
}
}
#endif
_