git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ppc
/
kernel
/
idle_6xx.S
diff --git
a/arch/ppc/kernel/idle_6xx.S
b/arch/ppc/kernel/idle_6xx.S
index
608f71c
..
25d009c
100644
(file)
--- a/
arch/ppc/kernel/idle_6xx.S
+++ b/
arch/ppc/kernel/idle_6xx.S
@@
-79,12
+79,12
@@
BEGIN_FTR_SECTION
/* Now check if user or arch enabled NAP mode */
lis r4,powersave_nap@ha
lwz r4,powersave_nap@l(r4)
/* Now check if user or arch enabled NAP mode */
lis r4,powersave_nap@ha
lwz r4,powersave_nap@l(r4)
- cmp
i
0,r4,0
+ cmp
wi
0,r4,0
beq 1f
lis r3,HID0_NAP@h
1:
END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
beq 1f
lis r3,HID0_NAP@h
1:
END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
- cmp
i
0,r3,0
+ cmp
wi
0,r3,0
beqlr
/* Clear MSR:EE */
beqlr
/* Clear MSR:EE */
@@
-133,7
+133,7
@@
BEGIN_FTR_SECTION
/* Go to low speed mode on some 750FX */
lis r4,powersave_lowspeed@ha
lwz r4,powersave_lowspeed@l(r4)
/* Go to low speed mode on some 750FX */
lis r4,powersave_lowspeed@ha
lwz r4,powersave_lowspeed@l(r4)
- cmp
i
0,r4,0
+ cmp
wi
0,r4,0
beq 1f
mfspr r4,SPRN_HID1
oris r4,r4,0x0001
beq 1f
mfspr r4,SPRN_HID1
oris r4,r4,0x0001