From 920cfd9f7bcb091891ed8718753d7576f6aac6de Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@jdl.com>
Date: Sat, 17 Jun 2006 17:49:42 -0500
Subject: [PATCH] --- yaml --- r: 28771 b: refs/heads/master c:
 2198c070498850c16d65c09bc587e3f5042126ef h: refs/heads/master i:   28769:
 b3dd0e69da3baebc9959ecb779014713cf13d737   28767:
 8d6356908a33ed9a1f05cf1ae80497a175de407b v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/kernel/cpu_setup_6xx.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index af3bb822f2d8..054e1b9f91e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db
+refs/heads/master: 2198c070498850c16d65c09bc587e3f5042126ef
diff --git a/trunk/arch/powerpc/kernel/cpu_setup_6xx.S b/trunk/arch/powerpc/kernel/cpu_setup_6xx.S
index 55ed7716636f..365381fcb27c 100644
--- a/trunk/arch/powerpc/kernel/cpu_setup_6xx.S
+++ b/trunk/arch/powerpc/kernel/cpu_setup_6xx.S
@@ -210,9 +210,11 @@ setup_745x_specifics:
 	 * the firmware. If any, we disable NAP capability as
 	 * it's known to be bogus on rev 2.1 and earlier
 	 */
+BEGIN_FTR_SECTION
 	mfspr	r11,SPRN_L3CR
 	andis.	r11,r11,L3CR_L3E@h
 	beq	1f
+END_FTR_SECTION_IFSET(CPU_FTR_L3CR)
 	lwz	r6,CPU_SPEC_FEATURES(r5)
 	andi.	r0,r6,CPU_FTR_L3_DISABLE_NAP
 	beq	1f