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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ppc
/
kernel
/
cpu_setup_power4.S
diff --git
a/arch/ppc/kernel/cpu_setup_power4.S
b/arch/ppc/kernel/cpu_setup_power4.S
index
f2ea1a9
..
6a674e8
100644
(file)
--- a/
arch/ppc/kernel/cpu_setup_power4.S
+++ b/
arch/ppc/kernel/cpu_setup_power4.S
@@
-9,13
+9,11
@@
*
*/
*
*/
-#include <linux/config.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <asm/ppc_asm.h>
#include <asm/cputable.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <asm/ppc_asm.h>
#include <asm/cputable.h>
-#include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
#include <asm/cache.h>
_GLOBAL(__970_cpu_preinit)
#include <asm/cache.h>
_GLOBAL(__970_cpu_preinit)
@@
-64,8
+62,6
@@
_GLOBAL(__970_cpu_preinit)
isync
blr
isync
blr
-_GLOBAL(__setup_cpu_power4)
- blr
_GLOBAL(__setup_cpu_ppc970)
mfspr r0,SPRN_HID0
li r11,5 /* clear DOZE and SLEEP */
_GLOBAL(__setup_cpu_ppc970)
mfspr r0,SPRN_HID0
li r11,5 /* clear DOZE and SLEEP */
@@
-89,10
+85,10
@@
_GLOBAL(__setup_cpu_ppc970)
#define CS_SIZE 32
.data
#define CS_SIZE 32
.data
- .balign L1_CACHE_
LINE_SIZE
+ .balign L1_CACHE_
BYTES
cpu_state_storage:
.space CS_SIZE
cpu_state_storage:
.space CS_SIZE
- .balign L1_CACHE_
LINE_SIZE
,0
+ .balign L1_CACHE_
BYTES
,0
.text
/* Called in normal context to backup CPU 0 state. This
.text
/* Called in normal context to backup CPU 0 state. This