aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2005-09-06 00:59:16 -0400
committerPaul Mackerras <paulus@samba.org>2005-09-06 02:09:22 -0400
commit0fdf0b8634055b016f7b93cfcdea2eb9091f0271 (patch)
tree6079114be4a38dff0109ba1e38fea4950a4cfc77 /arch/ppc64
parent8fef0306f9164d4bfd0befb62e63e4d1167681b5 (diff)
[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>
Diffstat (limited to 'arch/ppc64')
-rw-r--r--arch/ppc64/kernel/cputable.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/cputable.c b/arch/ppc64/kernel/cputable.c
index a18aa383f120..8831a28c3c4e 100644
--- a/arch/ppc64/kernel/cputable.c
+++ b/arch/ppc64/kernel/cputable.c
@@ -61,8 +61,10 @@ struct cpu_spec cpu_specs[] = {
61 .dcache_bsize = 128, 61 .dcache_bsize = 128,
62 .num_pmcs = 8, 62 .num_pmcs = 8,
63 .cpu_setup = __setup_cpu_power3, 63 .cpu_setup = __setup_cpu_power3,
64#ifdef CONFIG_OPROFILE
64 .oprofile_cpu_type = "ppc64/power3", 65 .oprofile_cpu_type = "ppc64/power3",
65 .oprofile_model = &op_model_rs64, 66 .oprofile_model = &op_model_rs64,
67#endif
66 }, 68 },
67 { /* Power3+ */ 69 { /* Power3+ */
68 .pvr_mask = 0xffff0000, 70 .pvr_mask = 0xffff0000,
@@ -75,8 +77,10 @@ struct cpu_spec cpu_specs[] = {
75 .dcache_bsize = 128, 77 .dcache_bsize = 128,
76 .num_pmcs = 8, 78 .num_pmcs = 8,
77 .cpu_setup = __setup_cpu_power3, 79 .cpu_setup = __setup_cpu_power3,
80#ifdef CONFIG_OPROFILE
78 .oprofile_cpu_type = "ppc64/power3", 81 .oprofile_cpu_type = "ppc64/power3",
79 .oprofile_model = &op_model_rs64, 82 .oprofile_model = &op_model_rs64,
83#endif
80 }, 84 },
81 { /* Northstar */ 85 { /* Northstar */
82 .pvr_mask = 0xffff0000, 86 .pvr_mask = 0xffff0000,
@@ -90,8 +94,10 @@ struct cpu_spec cpu_specs[] = {
90 .dcache_bsize = 128, 94 .dcache_bsize = 128,
91 .num_pmcs = 8, 95 .num_pmcs = 8,
92 .cpu_setup = __setup_cpu_power3, 96 .cpu_setup = __setup_cpu_power3,
97#ifdef CONFIG_OPROFILE
93 .oprofile_cpu_type = "ppc64/rs64", 98 .oprofile_cpu_type = "ppc64/rs64",
94 .oprofile_model = &op_model_rs64, 99 .oprofile_model = &op_model_rs64,
100#endif
95 }, 101 },
96 { /* Pulsar */ 102 { /* Pulsar */
97 .pvr_mask = 0xffff0000, 103 .pvr_mask = 0xffff0000,
@@ -105,8 +111,10 @@ struct cpu_spec cpu_specs[] = {
105 .dcache_bsize = 128, 111 .dcache_bsize = 128,
106 .num_pmcs = 8, 112 .num_pmcs = 8,
107 .cpu_setup = __setup_cpu_power3, 113 .cpu_setup = __setup_cpu_power3,
114#ifdef CONFIG_OPROFILE
108 .oprofile_cpu_type = "ppc64/rs64", 115 .oprofile_cpu_type = "ppc64/rs64",
109 .oprofile_model = &op_model_rs64, 116 .oprofile_model = &op_model_rs64,
117#endif
110 }, 118 },
111 { /* I-star */ 119 { /* I-star */
112 .pvr_mask = 0xffff0000, 120 .pvr_mask = 0xffff0000,
@@ -120,8 +128,10 @@ struct cpu_spec cpu_specs[] = {
120 .dcache_bsize = 128, 128 .dcache_bsize = 128,
121 .num_pmcs = 8, 129 .num_pmcs = 8,
122 .cpu_setup = __setup_cpu_power3, 130 .cpu_setup = __setup_cpu_power3,
131#ifdef CONFIG_OPROFILE
123 .oprofile_cpu_type = "ppc64/rs64", 132 .oprofile_cpu_type = "ppc64/rs64",
124 .oprofile_model = &op_model_rs64, 133 .oprofile_model = &op_model_rs64,
134#endif
125 }, 135 },
126 { /* S-star */ 136 { /* S-star */
127 .pvr_mask = 0xffff0000, 137 .pvr_mask = 0xffff0000,
@@ -135,8 +145,10 @@ struct cpu_spec cpu_specs[] = {
135 .dcache_bsize = 128, 145 .dcache_bsize = 128,
136 .num_pmcs = 8, 146 .num_pmcs = 8,
137 .cpu_setup = __setup_cpu_power3, 147 .cpu_setup = __setup_cpu_power3,
148#ifdef CONFIG_OPROFILE
138 .oprofile_cpu_type = "ppc64/rs64", 149 .oprofile_cpu_type = "ppc64/rs64",
139 .oprofile_model = &op_model_rs64, 150 .oprofile_model = &op_model_rs64,
151#endif
140 }, 152 },
141 { /* Power4 */ 153 { /* Power4 */
142 .pvr_mask = 0xffff0000, 154 .pvr_mask = 0xffff0000,
@@ -150,8 +162,10 @@ struct cpu_spec cpu_specs[] = {
150 .dcache_bsize = 128, 162 .dcache_bsize = 128,
151 .num_pmcs = 8, 163 .num_pmcs = 8,
152 .cpu_setup = __setup_cpu_power4, 164 .cpu_setup = __setup_cpu_power4,
165#ifdef CONFIG_OPROFILE
153 .oprofile_cpu_type = "ppc64/power4", 166 .oprofile_cpu_type = "ppc64/power4",
154 .oprofile_model = &op_model_rs64, 167 .oprofile_model = &op_model_rs64,
168#endif
155 }, 169 },
156 { /* Power4+ */ 170 { /* Power4+ */
157 .pvr_mask = 0xffff0000, 171 .pvr_mask = 0xffff0000,
@@ -165,8 +179,10 @@ struct cpu_spec cpu_specs[] = {
165 .dcache_bsize = 128, 179 .dcache_bsize = 128,
166 .num_pmcs = 8, 180 .num_pmcs = 8,
167 .cpu_setup = __setup_cpu_power4, 181 .cpu_setup = __setup_cpu_power4,
182#ifdef CONFIG_OPROFILE
168 .oprofile_cpu_type = "ppc64/power4", 183 .oprofile_cpu_type = "ppc64/power4",
169 .oprofile_model = &op_model_power4, 184 .oprofile_model = &op_model_power4,
185#endif
170 }, 186 },
171 { /* PPC970 */ 187 { /* PPC970 */
172 .pvr_mask = 0xffff0000, 188 .pvr_mask = 0xffff0000,
@@ -182,8 +198,10 @@ struct cpu_spec cpu_specs[] = {
182 .dcache_bsize = 128, 198 .dcache_bsize = 128,
183 .num_pmcs = 8, 199 .num_pmcs = 8,
184 .cpu_setup = __setup_cpu_ppc970, 200 .cpu_setup = __setup_cpu_ppc970,
201#ifdef CONFIG_OPROFILE
185 .oprofile_cpu_type = "ppc64/970", 202 .oprofile_cpu_type = "ppc64/970",
186 .oprofile_model = &op_model_power4, 203 .oprofile_model = &op_model_power4,
204#endif
187 }, 205 },
188 { /* PPC970FX */ 206 { /* PPC970FX */
189 .pvr_mask = 0xffff0000, 207 .pvr_mask = 0xffff0000,
@@ -199,8 +217,10 @@ struct cpu_spec cpu_specs[] = {
199 .dcache_bsize = 128, 217 .dcache_bsize = 128,
200 .num_pmcs = 8, 218 .num_pmcs = 8,
201 .cpu_setup = __setup_cpu_ppc970, 219 .cpu_setup = __setup_cpu_ppc970,
220#ifdef CONFIG_OPROFILE
202 .oprofile_cpu_type = "ppc64/970", 221 .oprofile_cpu_type = "ppc64/970",
203 .oprofile_model = &op_model_power4, 222 .oprofile_model = &op_model_power4,
223#endif
204 }, 224 },
205 { /* PPC970MP */ 225 { /* PPC970MP */
206 .pvr_mask = 0xffff0000, 226 .pvr_mask = 0xffff0000,
@@ -215,8 +235,10 @@ struct cpu_spec cpu_specs[] = {
215 .icache_bsize = 128, 235 .icache_bsize = 128,
216 .dcache_bsize = 128, 236 .dcache_bsize = 128,
217 .cpu_setup = __setup_cpu_ppc970, 237 .cpu_setup = __setup_cpu_ppc970,
238#ifdef CONFIG_OPROFILE
218 .oprofile_cpu_type = "ppc64/970", 239 .oprofile_cpu_type = "ppc64/970",
219 .oprofile_model = &op_model_power4, 240 .oprofile_model = &op_model_power4,
241#endif
220 }, 242 },
221 { /* Power5 */ 243 { /* Power5 */
222 .pvr_mask = 0xffff0000, 244 .pvr_mask = 0xffff0000,
@@ -232,8 +254,10 @@ struct cpu_spec cpu_specs[] = {
232 .dcache_bsize = 128, 254 .dcache_bsize = 128,
233 .num_pmcs = 6, 255 .num_pmcs = 6,
234 .cpu_setup = __setup_cpu_power4, 256 .cpu_setup = __setup_cpu_power4,
257#ifdef CONFIG_OPROFILE
235 .oprofile_cpu_type = "ppc64/power5", 258 .oprofile_cpu_type = "ppc64/power5",
236 .oprofile_model = &op_model_power4, 259 .oprofile_model = &op_model_power4,
260#endif
237 }, 261 },
238 { /* Power5 */ 262 { /* Power5 */
239 .pvr_mask = 0xffff0000, 263 .pvr_mask = 0xffff0000,
@@ -249,8 +273,10 @@ struct cpu_spec cpu_specs[] = {
249 .dcache_bsize = 128, 273 .dcache_bsize = 128,
250 .num_pmcs = 6, 274 .num_pmcs = 6,
251 .cpu_setup = __setup_cpu_power4, 275 .cpu_setup = __setup_cpu_power4,
276#ifdef CONFIG_OPROFILE
252 .oprofile_cpu_type = "ppc64/power5", 277 .oprofile_cpu_type = "ppc64/power5",
253 .oprofile_model = &op_model_power4, 278 .oprofile_model = &op_model_power4,
279#endif
254 }, 280 },
255 { /* BE DD1.x */ 281 { /* BE DD1.x */
256 .pvr_mask = 0xffff0000, 282 .pvr_mask = 0xffff0000,