fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / h8300 / mm / init.c

diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 9e39d2e..e4f4199 100644 (file)
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c
@@ -16,7 +16,6 @@
  *  DEC/2000 -- linux 2.4 support <davidm@snapgear.com>
  */
 
-#include <linux/config.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -139,7 +138,7 @@ void paging_init(void)
 #endif
 
        {
-               unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+               unsigned long zones_size[MAX_NR_ZONES] = {0, };
 
                zones_size[ZONE_DMA]     = 0 >> PAGE_SHIFT;
                zones_size[ZONE_NORMAL]  = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
@@ -162,7 +161,7 @@ void mem_init(void)
        unsigned long end_mem   = memory_end; /* DAVIDM - this must not include kernel stack at top */
 
 #ifdef DEBUG
-       printk("Mem_init: start=%lx, end=%lx\n", start_mem, end_mem);
+       printk(KERN_DEBUG "Mem_init: start=%lx, end=%lx\n", start_mem, end_mem);
 #endif
 
        end_mem &= PAGE_MASK;
@@ -179,7 +178,7 @@ void mem_init(void)
        initk = (&__init_begin - &__init_end) >> 10;
 
        tmp = nr_free_pages() << PAGE_SHIFT;
-       printk("Memory available: %luk/%luk RAM, %luk/%luk ROM (%dk kernel code, %dk data)\n",
+       printk(KERN_INFO "Memory available: %luk/%luk RAM, %luk/%luk ROM (%dk kernel code, %dk data)\n",
               tmp >> 10,
               len >> 10,
               (rom_length > 0) ? ((rom_length >> 10) - codek) : 0,
@@ -196,7 +195,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
        int pages = 0;
        for (; start < end; start += PAGE_SIZE) {
                ClearPageReserved(virt_to_page(start));
-               set_page_count(virt_to_page(start), 1);
+               init_page_count(virt_to_page(start));
                free_page(start);
                totalram_pages++;
                pages++;
@@ -219,11 +218,11 @@ free_initmem()
        /* next to check that the page we free is not a partial page */
        for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) {
                ClearPageReserved(virt_to_page(addr));
-               set_page_count(virt_to_page(addr), 1);
+               init_page_count(virt_to_page(addr));
                free_page(addr);
                totalram_pages++;
        }
-       printk("Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
+       printk(KERN_INFO "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
                        (addr - PAGE_ALIGN((long) &__init_begin)) >> 10,
                        (int)(PAGE_ALIGN((unsigned long)(&__init_begin))),
                        (int)(addr - PAGE_SIZE));