aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-07-22 15:08:50 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-26 05:48:02 -0400
commit6657fe4f5650ff7174d418d4bfa50c4640e81a2b (patch)
tree83433379aef1a09fe6898c68f5a16a857ece13af
parentdfa154289701ed315909b4e371a0381c52c8bdc9 (diff)
x86/oprofile: renaming athlon_*() into op_amd_*()
These functions contain code for all AMD CPUs. The new names fit better. Signed-off-by: Robert Richter <robert.richter@amd.com> Cc: oprofile-list <oprofile-list@lists.sourceforge.net> Cc: Barry Kasindorf <barry.kasindorf@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/oprofile/nmi_int.c8
-rw-r--r--arch/x86/oprofile/op_model_athlon.c28
-rw-r--r--arch/x86/oprofile/op_x86_model.h2
3 files changed, 19 insertions, 19 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 75e889156f23..b29819313f2b 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -425,21 +425,21 @@ int __init op_nmi_init(struct oprofile_operations *ops)
425 default: 425 default:
426 return -ENODEV; 426 return -ENODEV;
427 case 6: 427 case 6:
428 model = &op_athlon_spec; 428 model = &op_amd_spec;
429 cpu_type = "i386/athlon"; 429 cpu_type = "i386/athlon";
430 break; 430 break;
431 case 0xf: 431 case 0xf:
432 model = &op_athlon_spec; 432 model = &op_amd_spec;
433 /* Actually it could be i386/hammer too, but give 433 /* Actually it could be i386/hammer too, but give
434 user space an consistent name. */ 434 user space an consistent name. */
435 cpu_type = "x86-64/hammer"; 435 cpu_type = "x86-64/hammer";
436 break; 436 break;
437 case 0x10: 437 case 0x10:
438 model = &op_athlon_spec; 438 model = &op_amd_spec;
439 cpu_type = "x86-64/family10"; 439 cpu_type = "x86-64/family10";
440 break; 440 break;
441 case 0x11: 441 case 0x11:
442 model = &op_athlon_spec; 442 model = &op_amd_spec;
443 cpu_type = "x86-64/family11h"; 443 cpu_type = "x86-64/family11h";
444 break; 444 break;
445 } 445 }
diff --git a/arch/x86/oprofile/op_model_athlon.c b/arch/x86/oprofile/op_model_athlon.c
index d25d7f195036..40ecb020c7d2 100644
--- a/arch/x86/oprofile/op_model_athlon.c
+++ b/arch/x86/oprofile/op_model_athlon.c
@@ -45,9 +45,9 @@
45 45
46static unsigned long reset_value[NUM_COUNTERS]; 46static unsigned long reset_value[NUM_COUNTERS];
47 47
48/* functions for op_athlon_spec */ 48/* functions for op_amd_spec */
49 49
50static void athlon_fill_in_addresses(struct op_msrs * const msrs) 50static void op_amd_fill_in_addresses(struct op_msrs * const msrs)
51{ 51{
52 int i; 52 int i;
53 53
@@ -67,7 +67,7 @@ static void athlon_fill_in_addresses(struct op_msrs * const msrs)
67} 67}
68 68
69 69
70static void athlon_setup_ctrs(struct op_msrs const * const msrs) 70static void op_amd_setup_ctrs(struct op_msrs const * const msrs)
71{ 71{
72 unsigned int low, high; 72 unsigned int low, high;
73 int i; 73 int i;
@@ -116,7 +116,7 @@ static void athlon_setup_ctrs(struct op_msrs const * const msrs)
116} 116}
117 117
118 118
119static int athlon_check_ctrs(struct pt_regs * const regs, 119static int op_amd_check_ctrs(struct pt_regs * const regs,
120 struct op_msrs const * const msrs) 120 struct op_msrs const * const msrs)
121{ 121{
122 unsigned int low, high; 122 unsigned int low, high;
@@ -137,7 +137,7 @@ static int athlon_check_ctrs(struct pt_regs * const regs,
137} 137}
138 138
139 139
140static void athlon_start(struct op_msrs const * const msrs) 140static void op_amd_start(struct op_msrs const * const msrs)
141{ 141{
142 unsigned int low, high; 142 unsigned int low, high;
143 int i; 143 int i;
@@ -151,7 +151,7 @@ static void athlon_start(struct op_msrs const * const msrs)
151} 151}
152 152
153 153
154static void athlon_stop(struct op_msrs const * const msrs) 154static void op_amd_stop(struct op_msrs const * const msrs)
155{ 155{
156 unsigned int low, high; 156 unsigned int low, high;
157 int i; 157 int i;
@@ -167,7 +167,7 @@ static void athlon_stop(struct op_msrs const * const msrs)
167 } 167 }
168} 168}
169 169
170static void athlon_shutdown(struct op_msrs const * const msrs) 170static void op_amd_shutdown(struct op_msrs const * const msrs)
171{ 171{
172 int i; 172 int i;
173 173
@@ -190,15 +190,15 @@ static void op_amd_exit(void)
190{ 190{
191} 191}
192 192
193struct op_x86_model_spec const op_athlon_spec = { 193struct op_x86_model_spec const op_amd_spec = {
194 .init = op_amd_init, 194 .init = op_amd_init,
195 .exit = op_amd_exit, 195 .exit = op_amd_exit,
196 .num_counters = NUM_COUNTERS, 196 .num_counters = NUM_COUNTERS,
197 .num_controls = NUM_CONTROLS, 197 .num_controls = NUM_CONTROLS,
198 .fill_in_addresses = &athlon_fill_in_addresses, 198 .fill_in_addresses = &op_amd_fill_in_addresses,
199 .setup_ctrs = &athlon_setup_ctrs, 199 .setup_ctrs = &op_amd_setup_ctrs,
200 .check_ctrs = &athlon_check_ctrs, 200 .check_ctrs = &op_amd_check_ctrs,
201 .start = &athlon_start, 201 .start = &op_amd_start,
202 .stop = &athlon_stop, 202 .stop = &op_amd_stop,
203 .shutdown = &athlon_shutdown 203 .shutdown = &op_amd_shutdown
204}; 204};
diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index ee9ca96253f4..05a0261ba0c3 100644
--- a/arch/x86/oprofile/op_x86_model.h
+++ b/arch/x86/oprofile/op_x86_model.h
@@ -48,6 +48,6 @@ struct op_x86_model_spec {
48extern struct op_x86_model_spec const op_ppro_spec; 48extern struct op_x86_model_spec const op_ppro_spec;
49extern struct op_x86_model_spec const op_p4_spec; 49extern struct op_x86_model_spec const op_p4_spec;
50extern struct op_x86_model_spec const op_p4_ht2_spec; 50extern struct op_x86_model_spec const op_p4_ht2_spec;
51extern struct op_x86_model_spec const op_athlon_spec; 51extern struct op_x86_model_spec const op_amd_spec;
52 52
53#endif /* OP_X86_MODEL_H */ 53#endif /* OP_X86_MODEL_H */