diff options
author | Anton Blanchard <anton@samba.org> | 2006-06-10 06:32:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-06-15 05:31:26 -0400 |
commit | 227318bbde6c8309b1d20ab46532ec2b737e1fee (patch) | |
tree | de8bbbda0d69fc641629c10e5a0a1070a09bdde7 /arch/powerpc/kernel/cputable.c | |
parent | 8555a0029b1b0840237b750e55d4835a52cc719b (diff) |
[POWERPC] Remove stale 64bit on 32bit kernel code
Remove some stale POWER3/POWER4/970 on 32bit kernel support.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
-rw-r--r-- | arch/powerpc/kernel/cputable.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index dfe2fcfb20a0..abf7d42a8b07 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -189,17 +189,11 @@ struct cpu_spec cpu_specs[] = { | |||
189 | .oprofile_type = PPC_OPROFILE_POWER4, | 189 | .oprofile_type = PPC_OPROFILE_POWER4, |
190 | .platform = "ppc970", | 190 | .platform = "ppc970", |
191 | }, | 191 | }, |
192 | #endif /* CONFIG_PPC64 */ | ||
193 | #if defined(CONFIG_PPC64) || defined(CONFIG_POWER4) | ||
194 | { /* PPC970FX */ | 192 | { /* PPC970FX */ |
195 | .pvr_mask = 0xffff0000, | 193 | .pvr_mask = 0xffff0000, |
196 | .pvr_value = 0x003c0000, | 194 | .pvr_value = 0x003c0000, |
197 | .cpu_name = "PPC970FX", | 195 | .cpu_name = "PPC970FX", |
198 | #ifdef CONFIG_PPC32 | ||
199 | .cpu_features = CPU_FTRS_970_32, | ||
200 | #else | ||
201 | .cpu_features = CPU_FTRS_PPC970, | 196 | .cpu_features = CPU_FTRS_PPC970, |
202 | #endif | ||
203 | .cpu_user_features = COMMON_USER_POWER4 | | 197 | .cpu_user_features = COMMON_USER_POWER4 | |
204 | PPC_FEATURE_HAS_ALTIVEC_COMP, | 198 | PPC_FEATURE_HAS_ALTIVEC_COMP, |
205 | .icache_bsize = 128, | 199 | .icache_bsize = 128, |
@@ -210,8 +204,6 @@ struct cpu_spec cpu_specs[] = { | |||
210 | .oprofile_type = PPC_OPROFILE_POWER4, | 204 | .oprofile_type = PPC_OPROFILE_POWER4, |
211 | .platform = "ppc970", | 205 | .platform = "ppc970", |
212 | }, | 206 | }, |
213 | #endif /* defined(CONFIG_PPC64) || defined(CONFIG_POWER4) */ | ||
214 | #ifdef CONFIG_PPC64 | ||
215 | { /* PPC970MP */ | 207 | { /* PPC970MP */ |
216 | .pvr_mask = 0xffff0000, | 208 | .pvr_mask = 0xffff0000, |
217 | .pvr_value = 0x00440000, | 209 | .pvr_value = 0x00440000, |