Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86/oprofile: renaming athlon_*() into op_amd_*()

Browse Source 
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>
This commit is contained in:
Robert Richter 2008-07-22 21:08:50 +02:00 committed by Ingo Molnar
parent dfa1542897
commit 6657fe4f56
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/oprofile/nmi_int.c
View File

@ -425,21 +425,21 @@ int __init op_nmi_init(struct oprofile_operations *ops)
default:
return -ENODEV;
case 6:
model = &op_athlon_spec;
model = &op_amd_spec;
cpu_type = "i386/athlon";
break;
case 0xf:
model = &op_athlon_spec;
model = &op_amd_spec;
/* Actually it could be i386/hammer too, but give
user space an consistent name. */
cpu_type = "x86-64/hammer";
break;
case 0x10:
model = &op_athlon_spec;
model = &op_amd_spec;
cpu_type = "x86-64/family10";
break;
case 0x11:
model = &op_athlon_spec;
model = &op_amd_spec;
cpu_type = "x86-64/family11h";
break;
}

28
arch/x86/oprofile/op_model_athlon.c
View File

@ -45,9 +45,9 @@
static unsigned long reset_value[NUM_COUNTERS];
/* functions for op_athlon_spec */
/* functions for op_amd_spec */
static void athlon_fill_in_addresses(struct op_msrs * const msrs)
static void op_amd_fill_in_addresses(struct op_msrs * const msrs)
{
int i;
@ -67,7 +67,7 @@ static void athlon_fill_in_addresses(struct op_msrs * const msrs)
}
static void athlon_setup_ctrs(struct op_msrs const * const msrs)
static void op_amd_setup_ctrs(struct op_msrs const * const msrs)
{
unsigned int low, high;
int i;
@ -116,7 +116,7 @@ static void athlon_setup_ctrs(struct op_msrs const * const msrs)
}
static int athlon_check_ctrs(struct pt_regs * const regs,
static int op_amd_check_ctrs(struct pt_regs * const regs,
struct op_msrs const * const msrs)
{
unsigned int low, high;
@ -137,7 +137,7 @@ static int athlon_check_ctrs(struct pt_regs * const regs,
}
static void athlon_start(struct op_msrs const * const msrs)
static void op_amd_start(struct op_msrs const * const msrs)
{
unsigned int low, high;
int i;
@ -151,7 +151,7 @@ static void athlon_start(struct op_msrs const * const msrs)
}
static void athlon_stop(struct op_msrs const * const msrs)
static void op_amd_stop(struct op_msrs const * const msrs)
{
unsigned int low, high;
int i;
@ -167,7 +167,7 @@ static void athlon_stop(struct op_msrs const * const msrs)
}
}
static void athlon_shutdown(struct op_msrs const * const msrs)
static void op_amd_shutdown(struct op_msrs const * const msrs)
{
int i;
@ -190,15 +190,15 @@ static void op_amd_exit(void)
{
}
struct op_x86_model_spec const op_athlon_spec = {
struct op_x86_model_spec const op_amd_spec = {
.init = op_amd_init,
.exit = op_amd_exit,
.num_counters = NUM_COUNTERS,
.num_controls = NUM_CONTROLS,
.fill_in_addresses = &athlon_fill_in_addresses,
.setup_ctrs = &athlon_setup_ctrs,
.check_ctrs = &athlon_check_ctrs,
.start = &athlon_start,
.stop = &athlon_stop,
.shutdown = &athlon_shutdown
.fill_in_addresses = &op_amd_fill_in_addresses,
.setup_ctrs = &op_amd_setup_ctrs,
.check_ctrs = &op_amd_check_ctrs,
.start = &op_amd_start,
.stop = &op_amd_stop,
.shutdown = &op_amd_shutdown
};

2
arch/x86/oprofile/op_x86_model.h
View File

@ -48,6 +48,6 @@ struct op_x86_model_spec {
extern struct op_x86_model_spec const op_ppro_spec;
extern struct op_x86_model_spec const op_p4_spec;
extern struct op_x86_model_spec const op_p4_ht2_spec;
extern struct op_x86_model_spec const op_athlon_spec;
extern struct op_x86_model_spec const op_amd_spec;
#endif /* OP_X86_MODEL_H */