diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-25 13:02:35 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-25 13:02:35 +0200 |
| commit | 2fc565e4eaf8fc633bfc741b90e1f28dba732ee1 (patch) | |
| tree | 98c994692f84aee07cf1c7b4cda245ae5235a94d /arch/powerpc/kernel/signal_32.c | |
| parent | 7fc7d047216aa4923d401c637be2ebc6e3d5bd9b (diff) | |
| parent | 5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 (diff) | |
Merge tag 'asoc-v3.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10
A few more fixes, nothing too major though the DMA changes fix modular
builds.
Diffstat (limited to 'arch/powerpc/kernel/signal_32.c')
| -rw-r--r-- | arch/powerpc/kernel/signal_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 3acb28e245b..95068bf569a 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -866,10 +866,12 @@ static long restore_tm_user_regs(struct pt_regs *regs, do_load_up_transact_fpu(¤t->thread); regs->msr |= (MSR_FP | current->thread.fpexc_mode); } +#ifdef CONFIG_ALTIVEC if (msr & MSR_VEC) { do_load_up_transact_altivec(¤t->thread); regs->msr |= MSR_VEC; } +#endif return 0; } |