Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2198c070 authored by Jon Loeliger's avatar Jon Loeliger Committed by Paul Mackerras
Browse files

[POWERPC] Guard L3CR references with CPU_FTR_L3CR. 



Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7932f0b8

arch/powerpc/kernel/cpu_setup_6xx.S

+2 −0
Original line number Original line Diff line number Diff line
@@ -210,9 +210,11 @@ setup_745x_specifics: 
	 * the firmware. If any, we disable NAP capability as

	 * the firmware. If any, we disable NAP capability as

	 * it's known to be bogus on rev 2.1 and earlier

	 * it's known to be bogus on rev 2.1 and earlier

	 */

	 */

BEGIN_FTR_SECTION

	mfspr	r11,SPRN_L3CR

	mfspr	r11,SPRN_L3CR

	andis.	r11,r11,L3CR_L3E@h

	andis.	r11,r11,L3CR_L3E@h

	beq	1f

	beq	1f

END_FTR_SECTION_IFSET(CPU_FTR_L3CR)

	lwz	r6,CPU_SPEC_FEATURES(r5)

	lwz	r6,CPU_SPEC_FEATURES(r5)

	andi.	r0,r6,CPU_FTR_L3_DISABLE_NAP

	andi.	r0,r6,CPU_FTR_L3_DISABLE_NAP

	beq	1f

	beq	1f