1 files changed, 0 insertions, 90 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 0c157642c2a1..4fb0bb2ac885 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -123,96 +123,6 @@ extern void __restore_cpu_e6500(void);
 static struct cpu_spec __initdata cpu_specs[] = {
 #ifdef CONFIG_PPC_BOOK3S_64
-        {       /* Power3 */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00400000,
-                .cpu_name               = "POWER3 (630)",
-                .cpu_features           = CPU_FTRS_POWER3,
-                .cpu_user_features      = COMMON_USER_PPC64|PPC_FEATURE_PPC_LE,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/power3",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "power3",
-        },
-        {       /* Power3+ */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00410000,
-                .cpu_name               = "POWER3 (630+)",
-                .cpu_features           = CPU_FTRS_POWER3,
-                .cpu_user_features      = COMMON_USER_PPC64|PPC_FEATURE_PPC_LE,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/power3",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "power3",
-        },
-        {       /* Northstar */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00330000,
-                .cpu_name               = "RS64-II (northstar)",
-                .cpu_features           = CPU_FTRS_RS64,
-                .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "rs64",
-        },
-        {       /* Pulsar */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00340000,
-                .cpu_name               = "RS64-III (pulsar)",
-                .cpu_features           = CPU_FTRS_RS64,
-                .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "rs64",
-        },
-        {       /* I-star */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00360000,
-                .cpu_name               = "RS64-III (icestar)",
-                .cpu_features           = CPU_FTRS_RS64,
-                .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "rs64",
-        },
-        {       /* S-star */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00370000,
-                .cpu_name               = "RS64-IV (sstar)",
-                .cpu_features           = CPU_FTRS_RS64,
-                .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "rs64",
-        },
        {       /* Power4 */
                .pvr_mask               = 0xffff0000,
                .pvr_value              = 0x00350000,

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 0c157642c2a1..4fb0bb2ac885 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c
@@ -123,96 +123,6 @@ extern void __restore_cpu_e6500(void);
123		123
124	static struct cpu_spec __initdata cpu_specs[] = {	124	static struct cpu_spec __initdata cpu_specs[] = {
125	#ifdef CONFIG_PPC_BOOK3S_64	125	#ifdef CONFIG_PPC_BOOK3S_64
126	{ /* Power3 */
127	.pvr_mask = 0xffff0000,
128	.pvr_value = 0x00400000,
129	.cpu_name = "POWER3 (630)",
130	.cpu_features = CPU_FTRS_POWER3,
131	.cpu_user_features = COMMON_USER_PPC64\|PPC_FEATURE_PPC_LE,
132	.mmu_features = MMU_FTR_HPTE_TABLE,
133	.icache_bsize = 128,
134	.dcache_bsize = 128,
135	.num_pmcs = 8,
136	.pmc_type = PPC_PMC_IBM,
137	.oprofile_cpu_type = "ppc64/power3",
138	.oprofile_type = PPC_OPROFILE_RS64,
139	.platform = "power3",
140	},
141	{ /* Power3+ */
142	.pvr_mask = 0xffff0000,
143	.pvr_value = 0x00410000,
144	.cpu_name = "POWER3 (630+)",
145	.cpu_features = CPU_FTRS_POWER3,
146	.cpu_user_features = COMMON_USER_PPC64\|PPC_FEATURE_PPC_LE,
147	.mmu_features = MMU_FTR_HPTE_TABLE,
148	.icache_bsize = 128,
149	.dcache_bsize = 128,
150	.num_pmcs = 8,
151	.pmc_type = PPC_PMC_IBM,
152	.oprofile_cpu_type = "ppc64/power3",
153	.oprofile_type = PPC_OPROFILE_RS64,
154	.platform = "power3",
155	},
156	{ /* Northstar */
157	.pvr_mask = 0xffff0000,
158	.pvr_value = 0x00330000,
159	.cpu_name = "RS64-II (northstar)",
160	.cpu_features = CPU_FTRS_RS64,
161	.cpu_user_features = COMMON_USER_PPC64,
162	.mmu_features = MMU_FTR_HPTE_TABLE,
163	.icache_bsize = 128,
164	.dcache_bsize = 128,
165	.num_pmcs = 8,
166	.pmc_type = PPC_PMC_IBM,
167	.oprofile_cpu_type = "ppc64/rs64",
168	.oprofile_type = PPC_OPROFILE_RS64,
169	.platform = "rs64",
170	},
171	{ /* Pulsar */
172	.pvr_mask = 0xffff0000,
173	.pvr_value = 0x00340000,
174	.cpu_name = "RS64-III (pulsar)",
175	.cpu_features = CPU_FTRS_RS64,
176	.cpu_user_features = COMMON_USER_PPC64,
177	.mmu_features = MMU_FTR_HPTE_TABLE,
178	.icache_bsize = 128,
179	.dcache_bsize = 128,
180	.num_pmcs = 8,
181	.pmc_type = PPC_PMC_IBM,
182	.oprofile_cpu_type = "ppc64/rs64",
183	.oprofile_type = PPC_OPROFILE_RS64,
184	.platform = "rs64",
185	},
186	{ /* I-star */
187	.pvr_mask = 0xffff0000,
188	.pvr_value = 0x00360000,
189	.cpu_name = "RS64-III (icestar)",
190	.cpu_features = CPU_FTRS_RS64,
191	.cpu_user_features = COMMON_USER_PPC64,
192	.mmu_features = MMU_FTR_HPTE_TABLE,
193	.icache_bsize = 128,
194	.dcache_bsize = 128,
195	.num_pmcs = 8,
196	.pmc_type = PPC_PMC_IBM,
197	.oprofile_cpu_type = "ppc64/rs64",
198	.oprofile_type = PPC_OPROFILE_RS64,
199	.platform = "rs64",
200	},
201	{ /* S-star */
202	.pvr_mask = 0xffff0000,
203	.pvr_value = 0x00370000,
204	.cpu_name = "RS64-IV (sstar)",
205	.cpu_features = CPU_FTRS_RS64,
206	.cpu_user_features = COMMON_USER_PPC64,
207	.mmu_features = MMU_FTR_HPTE_TABLE,
208	.icache_bsize = 128,
209	.dcache_bsize = 128,
210	.num_pmcs = 8,
211	.pmc_type = PPC_PMC_IBM,
212	.oprofile_cpu_type = "ppc64/rs64",
213	.oprofile_type = PPC_OPROFILE_RS64,
214	.platform = "rs64",
215	},
216	{ /* Power4 */	126	{ /* Power4 */
217	.pvr_mask = 0xffff0000,	127	.pvr_mask = 0xffff0000,
218	.pvr_value = 0x00350000,	128	.pvr_value = 0x00350000,