public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86/oprofile: Moving nmi_setup_cpu_mux() in nmi_int.c

Browse source 
This patch moves some code in nmi_int.c to get a single separate
multiplexing code section.

Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
Robert Richter 2009-07-09 14:38:49 +02:00
parent 6ab82f958a
commit 48fb4b4671
1 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,11 +130,30 @@ static int nmi_setup_mux(void)
return 1; return 1;
} }
static void nmi_cpu_setup_mux(int cpu, struct op_msrs const * const msrs)
{
int i;
struct op_msr *multiplex = msrs->multiplex;
for (i = 0; i < model->num_virt_counters; ++i) {
if (counter_config[i].enabled) {
multiplex[i].saved = -(u64)counter_config[i].count;
} else {
multiplex[i].addr = 0;
multiplex[i].saved = 0;
}
}
per_cpu(switch_index, cpu) = 0;
}
#else #else
inline int op_x86_phys_to_virt(int phys) { return phys; } inline int op_x86_phys_to_virt(int phys) { return phys; }
static inline void nmi_shutdown_mux(void) { } static inline void nmi_shutdown_mux(void) { }
static inline int nmi_setup_mux(void) { return 1; } static inline int nmi_setup_mux(void) { return 1; }
static inline void
nmi_cpu_setup_mux(int cpu, struct op_msrs const * const msrs) { }
#endif #endif
@ -169,32 +188,6 @@ static int allocate_msrs(void)
return 1; return 1;
} }
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
static void nmi_cpu_setup_mux(int cpu, struct op_msrs const * const msrs)
{
int i;
struct op_msr *multiplex = msrs->multiplex;
for (i = 0; i < model->num_virt_counters; ++i) {
if (counter_config[i].enabled) {
multiplex[i].saved = -(u64)counter_config[i].count;
} else {
multiplex[i].addr = 0;
multiplex[i].saved = 0;
}
}
per_cpu(switch_index, cpu) = 0;
}
#else
static inline void
nmi_cpu_setup_mux(int cpu, struct op_msrs const * const msrs) { }
#endif
static void nmi_cpu_setup(void *dummy) static void nmi_cpu_setup(void *dummy)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();