diff options
Diffstat (limited to 'arch/ppc64/oprofile/common.c')
-rw-r--r-- | arch/ppc64/oprofile/common.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/ppc64/oprofile/common.c b/arch/ppc64/oprofile/common.c index a376eb2a1f0f..0260122a8d6c 100644 --- a/arch/ppc64/oprofile/common.c +++ b/arch/ppc64/oprofile/common.c | |||
@@ -132,7 +132,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
132 | case PV_630: | 132 | case PV_630: |
133 | case PV_630p: | 133 | case PV_630p: |
134 | model = &op_model_rs64; | 134 | model = &op_model_rs64; |
135 | ops->cpu_type = "ppc64/power3"; | ||
136 | break; | 135 | break; |
137 | 136 | ||
138 | case PV_NORTHSTAR: | 137 | case PV_NORTHSTAR: |
@@ -140,32 +139,29 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
140 | case PV_ICESTAR: | 139 | case PV_ICESTAR: |
141 | case PV_SSTAR: | 140 | case PV_SSTAR: |
142 | model = &op_model_rs64; | 141 | model = &op_model_rs64; |
143 | ops->cpu_type = "ppc64/rs64"; | ||
144 | break; | 142 | break; |
145 | 143 | ||
146 | case PV_POWER4: | 144 | case PV_POWER4: |
147 | case PV_POWER4p: | 145 | case PV_POWER4p: |
148 | model = &op_model_power4; | 146 | model = &op_model_power4; |
149 | ops->cpu_type = "ppc64/power4"; | ||
150 | break; | 147 | break; |
151 | 148 | ||
152 | case PV_970: | 149 | case PV_970: |
153 | case PV_970FX: | 150 | case PV_970FX: |
154 | case PV_970MP: | 151 | case PV_970MP: |
155 | model = &op_model_power4; | 152 | model = &op_model_power4; |
156 | ops->cpu_type = "ppc64/970"; | ||
157 | break; | 153 | break; |
158 | 154 | ||
159 | case PV_POWER5: | 155 | case PV_POWER5: |
160 | case PV_POWER5p: | 156 | case PV_POWER5p: |
161 | model = &op_model_power4; | 157 | model = &op_model_power4; |
162 | ops->cpu_type = "ppc64/power5"; | ||
163 | break; | 158 | break; |
164 | 159 | ||
165 | default: | 160 | default: |
166 | return -ENODEV; | 161 | return -ENODEV; |
167 | } | 162 | } |
168 | 163 | ||
164 | ops->cpu_type = cur_cpu_spec->oprofile_cpu_type; | ||
169 | model->num_counters = cur_cpu_spec->num_pmcs; | 165 | model->num_counters = cur_cpu_spec->num_pmcs; |
170 | ops->create_files = op_ppc64_create_files; | 166 | ops->create_files = op_ppc64_create_files; |
171 | ops->setup = op_ppc64_setup; | 167 | ops->setup = op_ppc64_setup; |