Merge branch 'merge'

diff --cc arch/powerpc/kernel/prom_init.c
Simple merge

diff --cc arch/powerpc/kernel/signal_32.c
Simple merge

diff --cc arch/powerpc/kernel/signal_64.c
index 66a5fbe,c2db642..6e75d7a
--- 1/arch/powerpc/kernel/signal_64.c
--- 2/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@@ -182,8 -179,11 +182,10 @@@ static long restore_sigcontext(struct p
  
  #ifdef CONFIG_ALTIVEC
        err |= __get_user(v_regs, &sc->v_regs);
 -      err |= __get_user(msr, &sc->gp_regs[PT_MSR]);
        if (err)
                return err;
+       if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128)))
+               return -EFAULT;
        /* Copy 33 vec registers (vr0..31 and vscr) from the stack */
        if (v_regs != 0 && (msr & MSR_VEC) != 0)
                err |= __copy_from_user(current->thread.vr, v_regs,

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge