Merge with Paulus

2 files changed, 9 insertions, 4 deletions

diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index ae24196d78f6..e0ca61b37f4f 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -131,6 +131,11 @@ EXPORT_SYMBOL(outw);
 EXPORT_SYMBOL(outl);
 EXPORT_SYMBOL(outsl);*/
 
+EXPORT_SYMBOL(__ide_mm_insl);
+EXPORT_SYMBOL(__ide_mm_outsw);
+EXPORT_SYMBOL(__ide_mm_insw);
+EXPORT_SYMBOL(__ide_mm_outsl);
+
 EXPORT_SYMBOL(_insb);
 EXPORT_SYMBOL(_outsb);
 EXPORT_SYMBOL(_insw);
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index f265b81e7008..16adde6b429d 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -606,22 +606,22 @@ int check_bug_trap(struct pt_regs *regs)
         if (bug->line & BUG_WARNING_TRAP) {
                 /* this is a WARN_ON rather than BUG/BUG_ON */
 #ifdef CONFIG_XMON
-                xmon_printf(KERN_ERR "Badness in %s at %s:%d\n",
+                xmon_printf(KERN_ERR "Badness in %s at %s:%ld\n",
                        bug->function, bug->file,
                        bug->line & ~BUG_WARNING_TRAP);
 #endif /* CONFIG_XMON */                
-                printk(KERN_ERR "Badness in %s at %s:%d\n",
+                printk(KERN_ERR "Badness in %s at %s:%ld\n",
                        bug->function, bug->file,
                        bug->line & ~BUG_WARNING_TRAP);
                 dump_stack();
                 return 1;
         }
 #ifdef CONFIG_XMON
-        xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%d!\n",
+        xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",
                bug->function, bug->file, bug->line);
         xmon(regs);
 #endif /* CONFIG_XMON */
-        printk(KERN_CRIT "kernel BUG in %s at %s:%d!\n",
+        printk(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",
                bug->function, bug->file, bug->line);
 
         return 0;