adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-01 13:46:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86/oprofile: Rework and simplify nmi_cpu_setup()

Browse source 
This patch removes the function nmi_save_registers(). Per-cpu code is
now executed only in the function nmi_cpu_setup().  Also, it renames
the per-cpu function nmi_restore_registers() to
nmi_cpu_restore_registers().

Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
Robert Richter 2009-07-09 18:33:02 +02:00
parent 8045a4c293
commit 44ab9a6b0e
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/x86/oprofile/nmi_int.c
View file

@ -87,13 +87,6 @@ static void nmi_cpu_save_registers(struct op_msrs *msrs)
} }
} }
static void nmi_save_registers(void *dummy)
{
int cpu = smp_processor_id();
struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu);
nmi_cpu_save_registers(msrs);
}
static void free_msrs(void) static void free_msrs(void)
{ {
int i; int i;
@ -137,6 +130,7 @@ static void nmi_cpu_setup(void *dummy)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu); struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu);
nmi_cpu_save_registers(msrs);
spin_lock(&oprofilefs_lock); spin_lock(&oprofilefs_lock);
model->setup_ctrs(model, msrs); model->setup_ctrs(model, msrs);
spin_unlock(&oprofilefs_lock); spin_unlock(&oprofilefs_lock);
@ -182,13 +176,12 @@ static int nmi_setup(void)
} }
} }
on_each_cpu(nmi_save_registers, NULL, 1);
on_each_cpu(nmi_cpu_setup, NULL, 1); on_each_cpu(nmi_cpu_setup, NULL, 1);
nmi_enabled = 1; nmi_enabled = 1;
return 0; return 0;
} }
static void nmi_restore_registers(struct op_msrs *msrs) static void nmi_cpu_restore_registers(struct op_msrs *msrs)
{ {
struct op_msr *counters = msrs->counters; struct op_msr *counters = msrs->counters;
struct op_msr *controls = msrs->controls; struct op_msr *controls = msrs->controls;
@ -220,7 +213,7 @@ static void nmi_cpu_shutdown(void *dummy)
apic_write(APIC_LVTERR, v | APIC_LVT_MASKED); apic_write(APIC_LVTERR, v | APIC_LVT_MASKED);
apic_write(APIC_LVTPC, per_cpu(saved_lvtpc, cpu)); apic_write(APIC_LVTPC, per_cpu(saved_lvtpc, cpu));
apic_write(APIC_LVTERR, v); apic_write(APIC_LVTERR, v);
nmi_restore_registers(msrs); nmi_cpu_restore_registers(msrs);
} }
static void nmi_shutdown(void) static void nmi_shutdown(void)