Merge remote-tracking branch 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 24 Apr 2013 04:43:36 +0000 (14:43 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 24 Apr 2013 04:43:36 +0000 (14:43 +1000)
Merge upstream to get the audit fixes

1  2 
arch/powerpc/kernel/process.c

@@@ -555,10 -555,12 +555,12 @@@ static inline void tm_recheckpoint_new_
                new->thread.regs->msr |=
                        (MSR_FP | new->thread.fpexc_mode);
        }
+ #ifdef CONFIG_ALTIVEC
        if (msr & MSR_VEC) {
                do_load_up_transact_altivec(&new->thread);
                new->thread.regs->msr |= MSR_VEC;
        }
+ #endif
        /* We may as well turn on VSX too since all the state is restored now */
        if (msr & MSR_VSX)
                new->thread.regs->msr |= MSR_VSX;
@@@ -910,6 -912,10 +912,6 @@@ int arch_dup_task_struct(struct task_st
        flush_altivec_to_thread(src);
        flush_vsx_to_thread(src);
        flush_spe_to_thread(src);
 -#ifdef CONFIG_HAVE_HW_BREAKPOINT
 -      flush_ptrace_hw_breakpoint(src);
 -#endif /* CONFIG_HAVE_HW_BREAKPOINT */
 -
        *dst = *src;
        return 0;
  }
@@@ -980,10 -986,6 +982,10 @@@ int copy_thread(unsigned long clone_fla
        p->thread.ksp_limit = (unsigned long)task_stack_page(p) +
                                _ALIGN_UP(sizeof(struct thread_info), 16);
  
 +#ifdef CONFIG_HAVE_HW_BREAKPOINT
 +      p->thread.ptrace_bps[0] = NULL;
 +#endif
 +
  #ifdef CONFIG_PPC_STD_MMU_64
        if (mmu_has_feature(MMU_FTR_SLB)) {
                unsigned long sp_vsid;