---

yaml --- r: 91423 b: refs/heads/master c: 445857e h: refs/heads/master i: 91421: f850bed 91419: 1ac3865 91415: 79ea3e5 91407: 95216b5 91391: 168191d v: v3
git-mirror · Feb 26, 2008 · 61482c1 · 61482c1
1 parent 0d9c5d3
commit 61482c1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 35 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8c8803bda4db47cbbdadb9b27b024e903e1d645
+refs/heads/master: 445857e0fc16ba3f74e778dd5a8707459c84f933
diff --git a/trunk/arch/powerpc/kernel/head_32.S b/trunk/arch/powerpc/kernel/head_32.S
@@ -762,23 +762,6 @@ load_up_altivec:
 	/* we haven't used ctr or xer or lr */
 	b	fast_exception_return
 
-/*
- * AltiVec unavailable trap from kernel - print a message, but let
- * the task use AltiVec in the kernel until it returns to user mode.
- */
-KernelAltiVec:
-	lwz	r3,_MSR(r1)
-	oris	r3,r3,MSR_VEC@h
-	stw	r3,_MSR(r1)	/* enable use of AltiVec after return */
-	lis	r3,87f@h
-	ori	r3,r3,87f@l
-	mr	r4,r2		/* current */
-	lwz	r5,_NIP(r1)
-	bl	printk
-	b	ret_from_except
-87:	.string	"AltiVec used in kernel  (task=%p, pc=%x)  \n"
-	.align	4,0
-
 /*
  * giveup_altivec(tsk)
  * Disable AltiVec for the task given as the argument,

diff --git a/trunk/arch/ppc/kernel/head.S b/trunk/arch/ppc/kernel/head.S
@@ -700,23 +700,6 @@ load_up_altivec:
 	/* we haven't used ctr or xer or lr */
 	b	fast_exception_return
 
-/*
- * AltiVec unavailable trap from kernel - print a message, but let
- * the task use AltiVec in the kernel until it returns to user mode.
- */
-KernelAltiVec:
-	lwz	r3,_MSR(r1)
-	oris	r3,r3,MSR_VEC@h
-	stw	r3,_MSR(r1)	/* enable use of AltiVec after return */
-	lis	r3,87f@h
-	ori	r3,r3,87f@l
-	mr	r4,r2		/* current */
-	lwz	r5,_NIP(r1)
-	bl	printk
-	b	ret_from_except
-87:	.string	"AltiVec used in kernel  (task=%p, pc=%x)  \n"
-	.align	4,0
-
 /*
  * giveup_altivec(tsk)
  * Disable AltiVec for the task given as the argument,