diff options
author | Kumar Gala <galak@freescale.com> | 2005-09-27 16:13:12 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 01:42:54 -0400 |
commit | 400d221274426958f1e1c7081a247bea9cede696 (patch) | |
tree | db0907bc14504d827b06b45004152b6610387b40 /arch/ppc/kernel/head.S | |
parent | 10b35d9978ac35556aec0d2642055742d8941488 (diff) |
[PATCH] ppc32: make cur_cpu_spec a single pointer instead of an array
Changed ppc32 so that cur_cpu_spec is just a single pointer for all CPUs.
Additionally, made call_setup_cpu check to see if the cpu_setup pointer
is NULL or not before calling the function. This lets remove the dummy
cpu_setup calls that just return.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/kernel/head.S')
-rw-r--r-- | arch/ppc/kernel/head.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S index d05509f197d0..8cdac7385e7f 100644 --- a/arch/ppc/kernel/head.S +++ b/arch/ppc/kernel/head.S | |||
@@ -1059,7 +1059,6 @@ __secondary_start: | |||
1059 | 1059 | ||
1060 | lis r3,-KERNELBASE@h | 1060 | lis r3,-KERNELBASE@h |
1061 | mr r4,r24 | 1061 | mr r4,r24 |
1062 | bl identify_cpu | ||
1063 | bl call_setup_cpu /* Call setup_cpu for this CPU */ | 1062 | bl call_setup_cpu /* Call setup_cpu for this CPU */ |
1064 | #ifdef CONFIG_6xx | 1063 | #ifdef CONFIG_6xx |
1065 | lis r3,-KERNELBASE@h | 1064 | lis r3,-KERNELBASE@h |
@@ -1109,11 +1108,6 @@ __secondary_start: | |||
1109 | * Those generic dummy functions are kept for CPUs not | 1108 | * Those generic dummy functions are kept for CPUs not |
1110 | * included in CONFIG_6xx | 1109 | * included in CONFIG_6xx |
1111 | */ | 1110 | */ |
1112 | _GLOBAL(__setup_cpu_power3) | ||
1113 | blr | ||
1114 | _GLOBAL(__setup_cpu_generic) | ||
1115 | blr | ||
1116 | |||
1117 | #if !defined(CONFIG_6xx) && !defined(CONFIG_POWER4) | 1111 | #if !defined(CONFIG_6xx) && !defined(CONFIG_POWER4) |
1118 | _GLOBAL(__save_cpu_setup) | 1112 | _GLOBAL(__save_cpu_setup) |
1119 | blr | 1113 | blr |