diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:20 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:20 -0400 |
| commit | 36a23fc8aa0c72ecafe7aaee0a823b03b301e1df (patch) | |
| tree | 364aa8cf248b477d822d0344d7bba3c80f86cf9c /arch/powerpc/kernel | |
| parent | 23386fe572028ca0f9249fb3c71ed31b54cf1665 (diff) | |
| parent | fc215fe7e6f0420afee0e0987fcc311929ee662f (diff) | |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_6xx.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_6xx.S b/arch/powerpc/kernel/cpu_setup_6xx.S index f1ee0b3f78f2..72d1d7395254 100644 --- a/arch/powerpc/kernel/cpu_setup_6xx.S +++ b/arch/powerpc/kernel/cpu_setup_6xx.S | |||
| @@ -17,7 +17,13 @@ | |||
| 17 | #include <asm/cache.h> | 17 | #include <asm/cache.h> |
| 18 | 18 | ||
| 19 | _GLOBAL(__setup_cpu_603) | 19 | _GLOBAL(__setup_cpu_603) |
| 20 | b setup_common_caches | 20 | mflr r4 |
| 21 | BEGIN_FTR_SECTION | ||
| 22 | bl __init_fpu_registers | ||
| 23 | END_FTR_SECTION_IFCLR(CPU_FTR_FPU_UNAVAILABLE) | ||
| 24 | bl setup_common_caches | ||
| 25 | mtlr r4 | ||
| 26 | blr | ||
| 21 | _GLOBAL(__setup_cpu_604) | 27 | _GLOBAL(__setup_cpu_604) |
| 22 | mflr r4 | 28 | mflr r4 |
| 23 | bl setup_common_caches | 29 | bl setup_common_caches |