Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Workaround for a sparse warning in include/asm-mips/mach-tx4927/ioremap.h
  [MIPS] Make show_code static and add __user tag
  [MIPS] Workaround for a sparse warning in include/asm-mips/compat.h
  [MIPS] Add some __user tags
  [MIPS] math-emu minor cleanup
  [MIPS] Kill CONFIG_TX4927BUG_WORKAROUND
  [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_FB_XPERT98
  [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_SRC_CLK
  [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_USE32K
  [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1XXX_PSC_SPI
  [CHAR] Delete leftovers of old Alchemy UART driver

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 5e9fa83c4ef0..37c562c4c817 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -131,7 +131,7 @@ static void show_stacktrace(struct task_struct *task, struct pt_regs *regs)
         const int field = 2 * sizeof(unsigned long);
         long stackdata;
         int i;
-        unsigned long *sp = (unsigned long *)regs->regs[29];
+        unsigned long __user *sp = (unsigned long __user *)regs->regs[29];
 
         printk("Stack :");
         i = 0;
@@ -187,7 +187,7 @@ void dump_stack(void)
 
 EXPORT_SYMBOL(dump_stack);
 
-void show_code(unsigned int *pc)
+static void show_code(unsigned int __user *pc)
 {
         long i;
 
@@ -305,7 +305,7 @@ void show_registers(struct pt_regs *regs)
         printk("Process %s (pid: %d, threadinfo=%p, task=%p)\n",
                 current->comm, current->pid, current_thread_info(), current);
         show_stacktrace(current, regs);
-        show_code((unsigned int *) regs->cp0_epc);
+        show_code((unsigned int __user *) regs->cp0_epc);
         printk("\n");
 }
 
@@ -865,7 +865,7 @@ asmlinkage void do_mcheck(struct pt_regs *regs)
                 dump_tlb_all();
         }
 
-        show_code((unsigned int *) regs->cp0_epc);
+        show_code((unsigned int __user *) regs->cp0_epc);
 
         /*
          * Some chips may have other causes of machine check (e.g. SB1