2 files changed, 8 insertions, 13 deletions

diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c
index 956607a63f4c..d9d249a66ff2 100644
--- a/arch/microblaze/mm/fault.c
+++ b/arch/microblaze/mm/fault.c
@@ -69,7 +69,7 @@ static int store_updates_sp(struct pt_regs *regs)
  * It is called from do_page_fault above and from some of the procedures
  * in traps.c.
  */
-static void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
+void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
 {
         const struct exception_table_entry *fixup;
 /* MS: no context */
@@ -122,15 +122,10 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
         }
 #endif /* CONFIG_KGDB */
 
-        if (in_atomic() || mm == NULL) {
-                /* FIXME */
-                if (kernel_mode(regs)) {
-                        printk(KERN_EMERG
-                                "Page fault in kernel mode - Oooou!!! pid %d\n",
-                                current->pid);
-                        _exception(SIGSEGV, regs, code, address);
-                        return;
-                }
+        if (in_atomic() || !mm) {
+                if (kernel_mode(regs))
+                        goto bad_area_nosemaphore;
+
                 /* in_atomic() in user mode is really bad,
                    as is current->mm == NULL. */
                 printk(KERN_EMERG "Page fault in user mode with "
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index b5a701cd71e0..8d92c4efe9a4 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -80,15 +80,15 @@ void __init setup_memory(void)
                         memory_size = memory_end - memory_start;
                         PAGE_OFFSET = memory_start;
                         printk(KERN_INFO "%s: Main mem: 0x%x-0x%x, "
-                                "size 0x%08x\n", __func__, memory_start,
-                                                memory_end, memory_size);
+                                "size 0x%08x\n", __func__, (u32) memory_start,
+                                        (u32) memory_end, (u32) memory_size);
                         break;
                 }
         }
 
         if (!memory_start || !memory_end) {
                 panic("%s: Missing memory setting 0x%08x-0x%08x\n",
-                        __func__, memory_start, memory_end);
+                        __func__, (u32) memory_start, (u32) memory_end);
         }
 
         /* reservation of region where is the kernel */