Skip to content

Commit 0fdf0b8

Browse files
antonblanchardpaulusmack
authored andcommitted
[PATCH] ppc64: Fix build with oprofile disabled
Fix build with oprofile disabled. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
1 parent 8fef030 commit 0fdf0b8

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

arch/ppc64/kernel/cputable.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ struct cpu_spec cpu_specs[] = {
6161
.dcache_bsize = 128,
6262
.num_pmcs = 8,
6363
.cpu_setup = __setup_cpu_power3,
64+
#ifdef CONFIG_OPROFILE
6465
.oprofile_cpu_type = "ppc64/power3",
6566
.oprofile_model = &op_model_rs64,
67+
#endif
6668
},
6769
{ /* Power3+ */
6870
.pvr_mask = 0xffff0000,
@@ -75,8 +77,10 @@ struct cpu_spec cpu_specs[] = {
7577
.dcache_bsize = 128,
7678
.num_pmcs = 8,
7779
.cpu_setup = __setup_cpu_power3,
80+
#ifdef CONFIG_OPROFILE
7881
.oprofile_cpu_type = "ppc64/power3",
7982
.oprofile_model = &op_model_rs64,
83+
#endif
8084
},
8185
{ /* Northstar */
8286
.pvr_mask = 0xffff0000,
@@ -90,8 +94,10 @@ struct cpu_spec cpu_specs[] = {
9094
.dcache_bsize = 128,
9195
.num_pmcs = 8,
9296
.cpu_setup = __setup_cpu_power3,
97+
#ifdef CONFIG_OPROFILE
9398
.oprofile_cpu_type = "ppc64/rs64",
9499
.oprofile_model = &op_model_rs64,
100+
#endif
95101
},
96102
{ /* Pulsar */
97103
.pvr_mask = 0xffff0000,
@@ -105,8 +111,10 @@ struct cpu_spec cpu_specs[] = {
105111
.dcache_bsize = 128,
106112
.num_pmcs = 8,
107113
.cpu_setup = __setup_cpu_power3,
114+
#ifdef CONFIG_OPROFILE
108115
.oprofile_cpu_type = "ppc64/rs64",
109116
.oprofile_model = &op_model_rs64,
117+
#endif
110118
},
111119
{ /* I-star */
112120
.pvr_mask = 0xffff0000,
@@ -120,8 +128,10 @@ struct cpu_spec cpu_specs[] = {
120128
.dcache_bsize = 128,
121129
.num_pmcs = 8,
122130
.cpu_setup = __setup_cpu_power3,
131+
#ifdef CONFIG_OPROFILE
123132
.oprofile_cpu_type = "ppc64/rs64",
124133
.oprofile_model = &op_model_rs64,
134+
#endif
125135
},
126136
{ /* S-star */
127137
.pvr_mask = 0xffff0000,
@@ -135,8 +145,10 @@ struct cpu_spec cpu_specs[] = {
135145
.dcache_bsize = 128,
136146
.num_pmcs = 8,
137147
.cpu_setup = __setup_cpu_power3,
148+
#ifdef CONFIG_OPROFILE
138149
.oprofile_cpu_type = "ppc64/rs64",
139150
.oprofile_model = &op_model_rs64,
151+
#endif
140152
},
141153
{ /* Power4 */
142154
.pvr_mask = 0xffff0000,
@@ -150,8 +162,10 @@ struct cpu_spec cpu_specs[] = {
150162
.dcache_bsize = 128,
151163
.num_pmcs = 8,
152164
.cpu_setup = __setup_cpu_power4,
165+
#ifdef CONFIG_OPROFILE
153166
.oprofile_cpu_type = "ppc64/power4",
154167
.oprofile_model = &op_model_rs64,
168+
#endif
155169
},
156170
{ /* Power4+ */
157171
.pvr_mask = 0xffff0000,
@@ -165,8 +179,10 @@ struct cpu_spec cpu_specs[] = {
165179
.dcache_bsize = 128,
166180
.num_pmcs = 8,
167181
.cpu_setup = __setup_cpu_power4,
182+
#ifdef CONFIG_OPROFILE
168183
.oprofile_cpu_type = "ppc64/power4",
169184
.oprofile_model = &op_model_power4,
185+
#endif
170186
},
171187
{ /* PPC970 */
172188
.pvr_mask = 0xffff0000,
@@ -182,8 +198,10 @@ struct cpu_spec cpu_specs[] = {
182198
.dcache_bsize = 128,
183199
.num_pmcs = 8,
184200
.cpu_setup = __setup_cpu_ppc970,
201+
#ifdef CONFIG_OPROFILE
185202
.oprofile_cpu_type = "ppc64/970",
186203
.oprofile_model = &op_model_power4,
204+
#endif
187205
},
188206
{ /* PPC970FX */
189207
.pvr_mask = 0xffff0000,
@@ -199,8 +217,10 @@ struct cpu_spec cpu_specs[] = {
199217
.dcache_bsize = 128,
200218
.num_pmcs = 8,
201219
.cpu_setup = __setup_cpu_ppc970,
220+
#ifdef CONFIG_OPROFILE
202221
.oprofile_cpu_type = "ppc64/970",
203222
.oprofile_model = &op_model_power4,
223+
#endif
204224
},
205225
{ /* PPC970MP */
206226
.pvr_mask = 0xffff0000,
@@ -215,8 +235,10 @@ struct cpu_spec cpu_specs[] = {
215235
.icache_bsize = 128,
216236
.dcache_bsize = 128,
217237
.cpu_setup = __setup_cpu_ppc970,
238+
#ifdef CONFIG_OPROFILE
218239
.oprofile_cpu_type = "ppc64/970",
219240
.oprofile_model = &op_model_power4,
241+
#endif
220242
},
221243
{ /* Power5 */
222244
.pvr_mask = 0xffff0000,
@@ -232,8 +254,10 @@ struct cpu_spec cpu_specs[] = {
232254
.dcache_bsize = 128,
233255
.num_pmcs = 6,
234256
.cpu_setup = __setup_cpu_power4,
257+
#ifdef CONFIG_OPROFILE
235258
.oprofile_cpu_type = "ppc64/power5",
236259
.oprofile_model = &op_model_power4,
260+
#endif
237261
},
238262
{ /* Power5 */
239263
.pvr_mask = 0xffff0000,
@@ -249,8 +273,10 @@ struct cpu_spec cpu_specs[] = {
249273
.dcache_bsize = 128,
250274
.num_pmcs = 6,
251275
.cpu_setup = __setup_cpu_power4,
276+
#ifdef CONFIG_OPROFILE
252277
.oprofile_cpu_type = "ppc64/power5",
253278
.oprofile_model = &op_model_power4,
279+
#endif
254280
},
255281
{ /* BE DD1.x */
256282
.pvr_mask = 0xffff0000,

0 commit comments

Comments
 (0)