From 61482c167d8a3e35754ff750ed4b3cc4df121000 Mon Sep 17 00:00:00 2001
From: Dale Farnsworth <dale@farnsworth.org>
Date: Fri, 1 Feb 2008 08:11:41 +1100
Subject: [PATCH] --- yaml --- r: 91423 b: refs/heads/master c:
 445857e0fc16ba3f74e778dd5a8707459c84f933 h: refs/heads/master i:   91421:
 f850bedd78d981ecc2394d0eac7d6991c691f84f   91419:
 1ac38651e93c3ca6d90a9d63f35a4979f22b809c   91415:
 79ea3e5707b0c8dd48cc3d56a24bab1a16ca93e2   91407:
 95216b54c0ee1b3c8a6383f686674e9598c5cd14   91391:
 168191d62a9f94c989d646a627c2b3fd346b7200 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/powerpc/kernel/head_32.S | 17 -----------------
 trunk/arch/ppc/kernel/head.S        | 17 -----------------
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index a219386befc9..9f3392a61e18 100644
--- 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
index 0f4fac512020..c16d1354b19d 100644
--- 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
index 1b0ec7202dd5..e7e642b95138 100644
--- 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,