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
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
arch
/
ppc64
/
kernel
/
cpu_setup_power4.S
diff --git
a/arch/ppc64/kernel/cpu_setup_power4.S
b/arch/ppc64/kernel/cpu_setup_power4.S
index
3816626
..
0e00985
100644
(file)
--- a/
arch/ppc64/kernel/cpu_setup_power4.S
+++ b/
arch/ppc64/kernel/cpu_setup_power4.S
@@
-119,7
+119,9
@@
_GLOBAL(__save_cpu_setup)
/* We only deal with 970 for now */
mfspr r0,SPRN_PVR
srwi r0,r0,16
/* We only deal with 970 for now */
mfspr r0,SPRN_PVR
srwi r0,r0,16
- cmpwi r0,0x39
+ cmpwi cr0,r0,0x39
+ cmpwi cr1,r0,0x3c
+ cror 4*cr0+eq,4*cr0+eq,4*cr1+eq
bne 1f
/* Save HID0,1,4 and 5 */
bne 1f
/* Save HID0,1,4 and 5 */
@@
-149,7
+151,9
@@
_GLOBAL(__restore_cpu_setup)
/* We only deal with 970 for now */
mfspr r0,SPRN_PVR
srwi r0,r0,16
/* We only deal with 970 for now */
mfspr r0,SPRN_PVR
srwi r0,r0,16
- cmpwi r0,0x39
+ cmpwi cr0,r0,0x39
+ cmpwi cr1,r0,0x3c
+ cror 4*cr0+eq,4*cr0+eq,4*cr1+eq
bne 1f
/* Clear interrupt prefix */
bne 1f
/* Clear interrupt prefix */