oprofile/x86: remove CONFIG_SMP macros
CPU notifier register functions also exist if CONFIG_SMP is
disabled. This change is part of hotplug code rework and also
necessary for later patches.
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Robert Richter <robert.richter@amd.com>
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 24582040..c5df8ee 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -471,7 +471,6 @@
return 0;
}
-#ifdef CONFIG_SMP
static int oprofile_cpu_notifier(struct notifier_block *b, unsigned long action,
void *data)
{
@@ -491,7 +490,6 @@
static struct notifier_block oprofile_cpu_nb = {
.notifier_call = oprofile_cpu_notifier
};
-#endif
#ifdef CONFIG_PM
@@ -701,9 +699,8 @@
return -ENODEV;
}
-#ifdef CONFIG_SMP
register_cpu_notifier(&oprofile_cpu_nb);
-#endif
+
/* default values, can be overwritten by model */
ops->create_files = nmi_create_files;
ops->setup = nmi_setup;
@@ -732,9 +729,7 @@
{
if (using_nmi) {
exit_sysfs();
-#ifdef CONFIG_SMP
unregister_cpu_notifier(&oprofile_cpu_nb);
-#endif
}
if (model->exit)
model->exit();