Skip to content

L
linux
Commit b75f53db authored by Carlos R. Mafra's avatar Carlos R. Mafra Committed by Ingo Molnar
Browse files
Options

x86: fix style errors in nmi_int.c 

This patch fixes most errors detected by checkpatch.pl.

                                     errors   lines of code   errors/KLOC
arch/x86/oprofile/nmi_int.c (after)       1             461           2.1
arch/x86/oprofile/nmi_int.c (before)     60             477         125.7

No code changed.

size:
   text    data     bss     dec     hex filename
   2675     264     472    3411     d53 nmi_int.o.after
   2675     264     472    3411     d53 nmi_int.o.before

md5sum:
  847aea0cc68fe1a2b5e7019439f3b4dd  nmi_int.o.after
  847aea0cc68fe1a2b5e7019439f3b4dd  nmi_int.o.before
Signed-off-by: default avatarCarlos R. Mafra <crmafra@gmail.com>
Reviewed-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b506a9d0
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 114 deletions
arch/x86/oprofile/nmi_int.c
View file @ b75f53db
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "op_counter.h" #include "op_counter.h"
#include "op_x86_model.h" #include "op_x86_model.h"
static struct op_x86_model_spec const * model; static struct op_x86_model_spec const *model;
static struct op_msrs cpu_msrs[NR_CPUS]; static struct op_msrs cpu_msrs[NR_CPUS];
static unsigned long saved_lvtpc[NR_CPUS]; static unsigned long saved_lvtpc[NR_CPUS];
...@@ -41,7 +41,6 @@ static int nmi_suspend(struct sys_device *dev, pm_message_t state) ...@@ -41,7 +41,6 @@ static int nmi_suspend(struct sys_device *dev, pm_message_t state)
return 0; return 0;
} }
static int nmi_resume(struct sys_device *dev) static int nmi_resume(struct sys_device *dev)
{ {
if (nmi_enabled == 1) if (nmi_enabled == 1)
...@@ -49,29 +48,27 @@ static int nmi_resume(struct sys_device *dev) ...@@ -49,29 +48,27 @@ static int nmi_resume(struct sys_device *dev)
return 0; return 0;
} }
static struct sysdev_class oprofile_sysclass = { static struct sysdev_class oprofile_sysclass = {
.name = "oprofile", .name = "oprofile",
.resume = nmi_resume, .resume = nmi_resume,
.suspend = nmi_suspend, .suspend = nmi_suspend,
}; };
static struct sys_device device_oprofile = { static struct sys_device device_oprofile = {
.id = 0, .id = 0,
.cls = &oprofile_sysclass, .cls = &oprofile_sysclass,
}; };
static int __init init_sysfs(void) static int __init init_sysfs(void)
{ {
int error; int error;
if (!(error = sysdev_class_register(&oprofile_sysclass)))
error = sysdev_class_register(&oprofile_sysclass);
if (!error)
error = sysdev_register(&device_oprofile); error = sysdev_register(&device_oprofile);
return error; return error;
} }
static void exit_sysfs(void) static void exit_sysfs(void)
{ {
sysdev_unregister(&device_oprofile); sysdev_unregister(&device_oprofile);
...@@ -90,7 +87,7 @@ static int profile_exceptions_notify(struct notifier_block *self, ...@@ -90,7 +87,7 @@ static int profile_exceptions_notify(struct notifier_block *self,
int ret = NOTIFY_DONE; int ret = NOTIFY_DONE;
int cpu = smp_processor_id(); int cpu = smp_processor_id();
switch(val) { switch (val) {
case DIE_NMI: case DIE_NMI:
if (model->check_ctrs(args->regs, &cpu_msrs[cpu])) if (model->check_ctrs(args->regs, &cpu_msrs[cpu]))
ret = NOTIFY_STOP; ret = NOTIFY_STOP;
...@@ -101,16 +98,16 @@ static int profile_exceptions_notify(struct notifier_block *self, ...@@ -101,16 +98,16 @@ static int profile_exceptions_notify(struct notifier_block *self,
return ret; return ret;
} }
static void nmi_cpu_save_registers(struct op_msrs * msrs) static void nmi_cpu_save_registers(struct op_msrs *msrs)
{ {
unsigned int const nr_ctrs = model->num_counters; unsigned int const nr_ctrs = model->num_counters;
unsigned int const nr_ctrls = model->num_controls; unsigned int const nr_ctrls = model->num_controls;
struct op_msr * counters = msrs->counters; struct op_msr *counters = msrs->counters;
struct op_msr * controls = msrs->controls; struct op_msr *controls = msrs->controls;
unsigned int i; unsigned int i;
for (i = 0; i < nr_ctrs; ++i) { for (i = 0; i < nr_ctrs; ++i) {
if (counters[i].addr){ if (counters[i].addr) {
rdmsr(counters[i].addr, rdmsr(counters[i].addr,
counters[i].saved.low, counters[i].saved.low,
counters[i].saved.high); counters[i].saved.high);
...@@ -118,7 +115,7 @@ static void nmi_cpu_save_registers(struct op_msrs * msrs) ...@@ -118,7 +115,7 @@ static void nmi_cpu_save_registers(struct op_msrs * msrs)
} }
for (i = 0; i < nr_ctrls; ++i) { for (i = 0; i < nr_ctrls; ++i) {
if (controls[i].addr){ if (controls[i].addr) {
rdmsr(controls[i].addr, rdmsr(controls[i].addr,
controls[i].saved.low, controls[i].saved.low,
controls[i].saved.high); controls[i].saved.high);
...@@ -126,15 +123,13 @@ static void nmi_cpu_save_registers(struct op_msrs * msrs) ...@@ -126,15 +123,13 @@ static void nmi_cpu_save_registers(struct op_msrs * msrs)
} }
} }
static void nmi_save_registers(void *dummy)
static void nmi_save_registers(void * dummy)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
struct op_msrs * msrs = &cpu_msrs[cpu]; struct op_msrs *msrs = &cpu_msrs[cpu];
nmi_cpu_save_registers(msrs); nmi_cpu_save_registers(msrs);
} }
static void free_msrs(void) static void free_msrs(void)
{ {
int i; int i;
...@@ -146,7 +141,6 @@ static void free_msrs(void) ...@@ -146,7 +141,6 @@ static void free_msrs(void)
} }
} }
static int allocate_msrs(void) static int allocate_msrs(void)
{ {
int success = 1; int success = 1;
...@@ -173,11 +167,10 @@ static int allocate_msrs(void) ...@@ -173,11 +167,10 @@ static int allocate_msrs(void)
return success; return success;
} }
static void nmi_cpu_setup(void *dummy)
static void nmi_cpu_setup(void * dummy)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
struct op_msrs * msrs = &cpu_msrs[cpu]; struct op_msrs *msrs = &cpu_msrs[cpu];
spin_lock(&oprofilefs_lock); spin_lock(&oprofilefs_lock);
model->setup_ctrs(msrs); model->setup_ctrs(msrs);
spin_unlock(&oprofilefs_lock); spin_unlock(&oprofilefs_lock);
...@@ -193,13 +186,14 @@ static struct notifier_block profile_exceptions_nb = { ...@@ -193,13 +186,14 @@ static struct notifier_block profile_exceptions_nb = {
static int nmi_setup(void) static int nmi_setup(void)
{ {
int err=0; int err = 0;
int cpu; int cpu;
if (!allocate_msrs()) if (!allocate_msrs())
return -ENOMEM; return -ENOMEM;
if ((err = register_die_notifier(&profile_exceptions_nb))){ err = register_die_notifier(&profile_exceptions_nb);
if (err) {
free_msrs(); free_msrs();
return err; return err;
} }
...@@ -210,7 +204,7 @@ static int nmi_setup(void) ...@@ -210,7 +204,7 @@ static int nmi_setup(void)
/* Assume saved/restored counters are the same on all CPUs */ /* Assume saved/restored counters are the same on all CPUs */
model->fill_in_addresses(&cpu_msrs[0]); model->fill_in_addresses(&cpu_msrs[0]);
for_each_possible_cpu (cpu) { for_each_possible_cpu(cpu) {
if (cpu != 0) { if (cpu != 0) {
memcpy(cpu_msrs[cpu].counters, cpu_msrs[0].counters, memcpy(cpu_msrs[cpu].counters, cpu_msrs[0].counters,
sizeof(struct op_msr) * model->num_counters); sizeof(struct op_msr) * model->num_counters);
...@@ -226,17 +220,16 @@ static int nmi_setup(void) ...@@ -226,17 +220,16 @@ static int nmi_setup(void)
return 0; return 0;
} }
static void nmi_restore_registers(struct op_msrs *msrs)
static void nmi_restore_registers(struct op_msrs * msrs)
{ {
unsigned int const nr_ctrs = model->num_counters; unsigned int const nr_ctrs = model->num_counters;
unsigned int const nr_ctrls = model->num_controls; unsigned int const nr_ctrls = model->num_controls;
struct op_msr * counters = msrs->counters; struct op_msr *counters = msrs->counters;
struct op_msr * controls = msrs->controls; struct op_msr *controls = msrs->controls;
unsigned int i; unsigned int i;
for (i = 0; i < nr_ctrls; ++i) { for (i = 0; i < nr_ctrls; ++i) {
if (controls[i].addr){ if (controls[i].addr) {
wrmsr(controls[i].addr, wrmsr(controls[i].addr,
controls[i].saved.low, controls[i].saved.low,
controls[i].saved.high); controls[i].saved.high);
...@@ -244,7 +237,7 @@ static void nmi_restore_registers(struct op_msrs * msrs) ...@@ -244,7 +237,7 @@ static void nmi_restore_registers(struct op_msrs * msrs)
} }
for (i = 0; i < nr_ctrs; ++i) { for (i = 0; i < nr_ctrs; ++i) {
if (counters[i].addr){ if (counters[i].addr) {
wrmsr(counters[i].addr, wrmsr(counters[i].addr,
counters[i].saved.low, counters[i].saved.low,
counters[i].saved.high); counters[i].saved.high);
...@@ -252,12 +245,11 @@ static void nmi_restore_registers(struct op_msrs * msrs) ...@@ -252,12 +245,11 @@ static void nmi_restore_registers(struct op_msrs * msrs)
} }
} }
static void nmi_cpu_shutdown(void *dummy)
static void nmi_cpu_shutdown(void * dummy)
{ {
unsigned int v; unsigned int v;
int cpu = smp_processor_id(); int cpu = smp_processor_id();
struct op_msrs * msrs = &cpu_msrs[cpu]; struct op_msrs *msrs = &cpu_msrs[cpu];
/* restoring APIC_LVTPC can trigger an apic error because the delivery /* restoring APIC_LVTPC can trigger an apic error because the delivery
* mode and vector nr combination can be illegal. That's by design: on * mode and vector nr combination can be illegal. That's by design: on
...@@ -271,7 +263,6 @@ static void nmi_cpu_shutdown(void * dummy) ...@@ -271,7 +263,6 @@ static void nmi_cpu_shutdown(void * dummy)
nmi_restore_registers(msrs); nmi_restore_registers(msrs);
} }
static void nmi_shutdown(void) static void nmi_shutdown(void)
{ {
nmi_enabled = 0; nmi_enabled = 0;
...@@ -281,42 +272,37 @@ static void nmi_shutdown(void) ...@@ -281,42 +272,37 @@ static void nmi_shutdown(void)
free_msrs(); free_msrs();
} }
static void nmi_cpu_start(void *dummy)
static void nmi_cpu_start(void * dummy)
{ {
struct op_msrs const * msrs = &cpu_msrs[smp_processor_id()]; struct op_msrs const *msrs = &cpu_msrs[smp_processor_id()];
model->start(msrs); model->start(msrs);
} }
static int nmi_start(void) static int nmi_start(void)
{ {
on_each_cpu(nmi_cpu_start, NULL, 0, 1); on_each_cpu(nmi_cpu_start, NULL, 0, 1);
return 0; return 0;
} }
static void nmi_cpu_stop(void *dummy)
static void nmi_cpu_stop(void * dummy)
{ {
struct op_msrs const * msrs = &cpu_msrs[smp_processor_id()]; struct op_msrs const *msrs = &cpu_msrs[smp_processor_id()];
model->stop(msrs); model->stop(msrs);
} }
static void nmi_stop(void) static void nmi_stop(void)
{ {
on_each_cpu(nmi_cpu_stop, NULL, 0, 1); on_each_cpu(nmi_cpu_stop, NULL, 0, 1);
} }
struct op_counter_config counter_config[OP_MAX_COUNTER]; struct op_counter_config counter_config[OP_MAX_COUNTER];
static int nmi_create_files(struct super_block * sb, struct dentry * root) static int nmi_create_files(struct super_block *sb, struct dentry *root)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < model->num_counters; ++i) { for (i = 0; i < model->num_counters; ++i) {
struct dentry * dir; struct dentry *dir;
char buf[4]; char buf[4];
/* quick little hack to _not_ expose a counter if it is not /* quick little hack to _not_ expose a counter if it is not
...@@ -343,7 +329,7 @@ static int nmi_create_files(struct super_block * sb, struct dentry * root) ...@@ -343,7 +329,7 @@ static int nmi_create_files(struct super_block * sb, struct dentry * root)
static int p4force; static int p4force;
module_param(p4force, int, 0); module_param(p4force, int, 0);
static int __init p4_init(char ** cpu_type) static int __init p4_init(char **cpu_type)
{ {
__u8 cpu_model = boot_cpu_data.x86_model; __u8 cpu_model = boot_cpu_data.x86_model;
...@@ -373,8 +359,7 @@ static int __init p4_init(char ** cpu_type) ...@@ -373,8 +359,7 @@ static int __init p4_init(char ** cpu_type)
return 0; return 0;
} }
static int __init ppro_init(char **cpu_type)
static int __init ppro_init(char ** cpu_type)
{ {
__u8 cpu_model = boot_cpu_data.x86_model; __u8 cpu_model = boot_cpu_data.x86_model;
...@@ -469,7 +454,6 @@ int __init op_nmi_init(struct oprofile_operations *ops) ...@@ -469,7 +454,6 @@ int __init op_nmi_init(struct oprofile_operations *ops)
return 0; return 0;
} }
void op_nmi_exit(void) void op_nmi_exit(void)
{ {
if (using_nmi) if (using_nmi)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7