---

yaml --- r: 28771 b: refs/heads/master c: 2198c07 h: refs/heads/master i: 28769: b3dd0e6 28767: 8d63569 v: v3
git-mirror · Jun 21, 2006 · 920cfd9 · 920cfd9
1 parent 1e1f14d
commit 920cfd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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