diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-04 11:02:09 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-04 11:02:09 +1000 |
| commit | 26f571d7c968dbd30656fc1421eeb0d9088aaad9 (patch) | |
| tree | 96b4df5f75b70cf102bf83dece20dafcde0b2e48 /arch/ppc | |
| parent | e077b50c29a7e8be5812d1156934ea837b712ca6 (diff) | |
| download | linux-stable-26f571d7c968dbd30656fc1421eeb0d9088aaad9.tar.gz linux-stable-26f571d7c968dbd30656fc1421eeb0d9088aaad9.tar.bz2 linux-stable-26f571d7c968dbd30656fc1421eeb0d9088aaad9.zip | |
[PPC] Use cpu setup routines from cpu_setup_44x.S for ARCH=ppc
Commit 8112753bb2c0045398c89d0647792b39805f6d40 made 44x in
ARCH=powerpc builds use cpu setup routines in cpu_setup_44x.S,
but didn't make a similar change for ARCH=ppc, and consequently
the ARCH=ppc builds fail with undefined symbols (since both use
the same cputable.c).
This fixes it by including cpu_setup_44x.S in the ARCH=ppc builds,
and by taking out the now-redundant FPU initialization in
arch/ppc/kernel/head_44x.S.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/head_44x.S | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S index 7e44de5a26db..75bbc937ed73 100644 --- a/arch/ppc/kernel/head_44x.S +++ b/arch/ppc/kernel/head_44x.S @@ -227,16 +227,6 @@ skpinv: addi r4,r4,1 /* Increment */ lis r4,interrupt_base@h /* IVPR only uses the high 16-bits */ mtspr SPRN_IVPR,r4 -#ifdef CONFIG_440EP - /* Clear DAPUIB flag in CCR0 (enable APU between CPU and FPU) */ - mfspr r2,SPRN_CCR0 - lis r3,0xffef - ori r3,r3,0xffff - and r2,r2,r3 - mtspr SPRN_CCR0,r2 - isync -#endif - /* * This is where the main kernel code starts. */ |