diff --git a/[refs] b/[refs]
index c06722e5b9f7..fd4e76e4f295 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5f7b06b036afc2cb250decb2c76b7f82c5de639
+refs/heads/master: 434cc69fbb02dd7ca64c5029dc6a6f9636f77e02
diff --git a/trunk/arch/ppc/kernel/process.c b/trunk/arch/ppc/kernel/process.c
index 78ea10197a0b..cb1c7b92f8c6 100644
--- a/trunk/arch/ppc/kernel/process.c
+++ b/trunk/arch/ppc/kernel/process.c
@@ -347,11 +347,13 @@ struct task_struct *__switch_to(struct task_struct *prev,
 #endif /* CONFIG_SPE */
 #endif /* CONFIG_SMP */
 
+#ifdef CONFIG_ALTIVEC
 	/* Avoid the trap.  On smp this this never happens since
 	 * we don't set last_task_used_altivec -- Cort
 	 */
 	if (new->thread.regs && last_task_used_altivec == new)
 		new->thread.regs->msr |= MSR_VEC;
+#endif
 #ifdef CONFIG_SPE
 	/* Avoid the trap.  On smp this this never happens since
 	 * we don't set last_task_used_spe