2 files changed, 6 insertions, 10 deletions

diff --git a/arch/m68k/mm/init_mm.c b/arch/m68k/mm/init_mm.c
index 9113c2f1760..bbe525434cc 100644
--- a/arch/m68k/mm/init_mm.c
+++ b/arch/m68k/mm/init_mm.c
@@ -83,11 +83,6 @@ void __init mem_init(void)
         int initpages = 0;
         int i;
 
-#ifdef CONFIG_ATARI
-        if (MACH_IS_ATARI)
-                atari_stram_mem_init_hook();
-#endif
-
         /* this will put all memory onto the freelists */
         totalram_pages = num_physpages = 0;
         for_each_online_pgdat(pgdat) {
diff --git a/arch/m68k/mm/init_no.c b/arch/m68k/mm/init_no.c
index 7cbd7bd1f8b..50cd12cf28d 100644
--- a/arch/m68k/mm/init_no.c
+++ b/arch/m68k/mm/init_no.c
@@ -42,7 +42,7 @@
  * ZERO_PAGE is a special page that is used for zero-initialized
  * data and COW.
  */
-unsigned long empty_zero_page;
+void *empty_zero_page;
 
 extern unsigned long memory_start;
 extern unsigned long memory_end;
@@ -62,8 +62,8 @@ void __init paging_init(void)
         unsigned long end_mem   = memory_end & PAGE_MASK;
         unsigned long zones_size[MAX_NR_ZONES] = {0, };
 
-        empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
-        memset((void *)empty_zero_page, 0, PAGE_SIZE);
+        empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
+        memset(empty_zero_page, 0, PAGE_SIZE);
 
         /*
          * Set up SFC/DFC registers (user data space).
@@ -120,7 +120,8 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                 totalram_pages++;
                 pages++;
         }
-        printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
+        pr_notice("Freeing initrd memory: %luk freed\n",
+                  pages * (PAGE_SIZE / 1024));
 }
 #endif
 
@@ -141,7 +142,7 @@ void free_initmem(void)
                 free_page(addr);
                 totalram_pages++;
         }
-        printk(KERN_NOTICE "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
+        pr_notice("Freeing unused kernel memory: %luk freed (0x%x - 0x%x)\n",
                         (addr - PAGE_ALIGN((long) &__init_begin)) >> 10,
                         (int)(PAGE_ALIGN((unsigned long)(&__init_begin))),
                         (int)(addr - PAGE_SIZE));