sparc32: add init memory poisoning
authorRobert Reif <reif@earthlink.net>
Wed, 3 Sep 2008 23:29:42 +0000 (16:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Sep 2008 23:29:42 +0000 (16:29 -0700)
This patch adds init memory poisoning.  It looks like
totalram_pages was not updated properly in free_initrd_mem
so I fixed that as well.

Signed-off-by: Robert Reif <reif@earthlink.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/mm/init.c

index e103f1bb3777ebdb11e72aea72fa399e11c02ac1..677c1e187a23e57b2fd2cf370b4aa1ae8a52ad4a 100644 (file)
@@ -23,6 +23,7 @@
 #include <linux/highmem.h>
 #include <linux/bootmem.h>
 #include <linux/pagemap.h>
+#include <linux/poison.h>
 
 #include <asm/system.h>
 #include <asm/vac-ops.h>
@@ -480,6 +481,7 @@ void free_initmem (void)
        for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
                struct page *p;
 
+               memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
                p = virt_to_page(addr);
 
                ClearPageReserved(p);
@@ -488,20 +490,26 @@ void free_initmem (void)
                totalram_pages++;
                num_physpages++;
        }
-       printk (KERN_INFO "Freeing unused kernel memory: %dk freed\n", (&__init_end - &__init_begin) >> 10);
+       printk(KERN_INFO "Freeing unused kernel memory: %dk freed\n",
+               (&__init_end - &__init_begin) >> 10);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
        if (start < end)
-               printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+               printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",
+                       (end - start) >> 10);
        for (; start < end; start += PAGE_SIZE) {
-               struct page *p = virt_to_page(start);
+               struct page *p;
+
+               memset((void *)start, POISON_FREE_INITMEM, PAGE_SIZE);
+               p = virt_to_page(start);
 
                ClearPageReserved(p);
                init_page_count(p);
                __free_page(p);
+               totalram_pages++;
                num_physpages++;
        }
 }