diff options
| author | Jon Loeliger <jdl@jdl.com> | 2006-06-17 18:49:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-21 01:01:27 -0400 |
| commit | 2198c070498850c16d65c09bc587e3f5042126ef (patch) | |
| tree | 4bc2cb0f7defd3f8e941195ce6de13d4d25ab2b0 /arch/powerpc/kernel/cpu_setup_6xx.S | |
| parent | 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db (diff) | |
[POWERPC] Guard L3CR references with CPU_FTR_L3CR.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/cpu_setup_6xx.S')
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_6xx.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_6xx.S b/arch/powerpc/kernel/cpu_setup_6xx.S index 55ed7716636f..365381fcb27c 100644 --- a/arch/powerpc/kernel/cpu_setup_6xx.S +++ b/arch/powerpc/kernel/cpu_setup_6xx.S | |||
| @@ -210,9 +210,11 @@ setup_745x_specifics: | |||
| 210 | * the firmware. If any, we disable NAP capability as | 210 | * the firmware. If any, we disable NAP capability as |
| 211 | * it's known to be bogus on rev 2.1 and earlier | 211 | * it's known to be bogus on rev 2.1 and earlier |
| 212 | */ | 212 | */ |
| 213 | BEGIN_FTR_SECTION | ||
| 213 | mfspr r11,SPRN_L3CR | 214 | mfspr r11,SPRN_L3CR |
| 214 | andis. r11,r11,L3CR_L3E@h | 215 | andis. r11,r11,L3CR_L3E@h |
| 215 | beq 1f | 216 | beq 1f |
| 217 | END_FTR_SECTION_IFSET(CPU_FTR_L3CR) | ||
| 216 | lwz r6,CPU_SPEC_FEATURES(r5) | 218 | lwz r6,CPU_SPEC_FEATURES(r5) |
| 217 | andi. r0,r6,CPU_FTR_L3_DISABLE_NAP | 219 | andi. r0,r6,CPU_FTR_L3_DISABLE_NAP |
| 218 | beq 1f | 220 | beq 1f |