diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 09:28:14 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 09:28:14 +1100 |
commit | ff2e6d7e27cf1f757ab0d97e1a9e46de47152a0e (patch) | |
tree | 3fc5952629df5cd6a5c3e49e44b3f43a2e0414bb /arch/powerpc/kernel/idle_6xx.S | |
parent | 9618edab82fda8dbce5ea3abcdac9ded07abb2d4 (diff) |
powerpc: Fix goof in 6xx and POWER4 idle power-save functions
This fixes a mistake I made when editing these functions - when I
took out the interrupt disabling code (because interrupts are now
disabled by the caller) I left the register that is used for the MSR
value to be used during doze/nap uninitialized. This fixes it.
Also updated some of the comments in idle_power4.S and removed some
code that was copied over from idle_6xx.S but is no longer relevant
(we don't ever clear the CPU_FTR_CAN_NAP bit at runtime for POWER4).
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/idle_6xx.S')
-rw-r--r-- | arch/powerpc/kernel/idle_6xx.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S index 1647ea361ef..12a4efbaa08 100644 --- a/arch/powerpc/kernel/idle_6xx.S +++ b/arch/powerpc/kernel/idle_6xx.S @@ -144,7 +144,8 @@ BEGIN_FTR_SECTION DSSALL sync END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) - ori r7,r7,MSR_EE /* Could be ommited (already set) */ + mfmsr r7 + ori r7,r7,MSR_EE oris r7,r7,MSR_POW@h sync isync |