diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-24 06:43:36 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-24 06:43:36 +0200 |
| commit | 234d15def96ac49027dc869f7bc250d5cb0eb5d7 (patch) | |
| tree | 51fba17fa3949138c73640ba7cd53988ac712340 /arch/powerpc/kernel/process.c | |
| parent | powerpc/spufs: Initialise inode->i_ino in spufs_new_inode() (diff) | |
| parent | Linux 3.9-rc8 (diff) | |
| download | linux-234d15def96ac49027dc869f7bc250d5cb0eb5d7.tar.xz linux-234d15def96ac49027dc869f7bc250d5cb0eb5d7.zip | |
Merge remote-tracking branch 'origin/master' into next
Merge upstream to get the audit fixes
Diffstat (limited to 'arch/powerpc/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 834805cf13cb..c0dea6f23567 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -555,10 +555,12 @@ static inline void tm_recheckpoint_new_task(struct task_struct *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; |