diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2006-05-19 06:24:18 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 06:24:18 +0200 |
| commit | b26f100d89c87060b561c3108582b7cb81521df8 (patch) | |
| tree | 57e566bb4f1411e059e59b0f43bc9544e15616e8 /arch/powerpc/kernel/misc_64.S | |
| parent | [PATCH] powerpc/pseries: Increment fail counter in PCI recovery (diff) | |
| download | linux-b26f100d89c87060b561c3108582b7cb81521df8.tar.xz linux-b26f100d89c87060b561c3108582b7cb81521df8.zip | |
[PATCH] powerpc: remove do-nothing cpu setup routines
Removed the do-nothing routines __setup_cpu_power3 and
__setup_cpu_power4 and replaced them with a null pointer check
in the caller. Also removed the Cell processor specific
routine __setup_cpu_be which improperly accessed the
hypervisor page size configuration at SPR HID6.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/misc_64.S')
| -rw-r--r-- | arch/powerpc/kernel/misc_64.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index 2778cce058e2..e8883d42c43c 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S @@ -482,7 +482,9 @@ _GLOBAL(identify_cpu) sub r0,r3,r5 std r0,0(r4) ld r4,CPU_SPEC_SETUP(r3) + cmpdi 0,r4,0 add r4,r4,r5 + beqlr ld r4,0(r4) add r4,r4,r5 mtctr r4 @@ -768,9 +770,6 @@ _GLOBAL(giveup_altivec) #endif /* CONFIG_ALTIVEC */ -_GLOBAL(__setup_cpu_power3) - blr - _GLOBAL(execve) li r0,__NR_execve sc |