|
@@ -197,14 +197,6 @@ void __init bootmem_init(void)
|
|
|
max_pfn = max_low_pfn = max;
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * Poison init memory with an undefined instruction (0x0).
|
|
|
- */
|
|
|
-static inline void poison_init_mem(void *s, size_t count)
|
|
|
-{
|
|
|
- memset(s, 0, count);
|
|
|
-}
|
|
|
-
|
|
|
#ifndef CONFIG_SPARSEMEM_VMEMMAP
|
|
|
static inline void free_memmap(unsigned long start_pfn, unsigned long end_pfn)
|
|
|
{
|
|
@@ -386,8 +378,7 @@ void __init mem_init(void)
|
|
|
|
|
|
void free_initmem(void)
|
|
|
{
|
|
|
- poison_init_mem(__init_begin, __init_end - __init_begin);
|
|
|
- free_initmem_default(-1);
|
|
|
+ free_initmem_default(0);
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
@@ -396,10 +387,8 @@ static int keep_initrd;
|
|
|
|
|
|
void free_initrd_mem(unsigned long start, unsigned long end)
|
|
|
{
|
|
|
- if (!keep_initrd) {
|
|
|
- poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
|
|
|
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
|
|
|
- }
|
|
|
+ if (!keep_initrd)
|
|
|
+ free_reserved_area((void *)start, (void *)end, 0, "initrd");
|
|
|
}
|
|
|
|
|
|
static int __init keepinitrd_setup(char *__unused)
|