Commit-ID: 216f3d9b4e5121feea4b13fae9d4c83e8d7e1c8a
Gitweb: http://git.kernel.org/tip/216f3d9b4e5121feea4b13fae9d4c83e8d7e1c8a
Author: Robert Richter <robert.richter@xxxxxxx>
AuthorDate: Mon, 3 May 2010 11:58:46 +0200
Committer: Robert Richter <robert.richter@xxxxxxx>
CommitDate: Tue, 4 May 2010 11:37:56 +0200
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@xxxxxxxxxxxxxx>
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
---
arch/x86/oprofile/nmi_int.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 2458204..c5df8ee 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -471,7 +471,6 @@ static int nmi_create_files(struct super_block *sb, struct dentry *root)
return 0;
}
-#ifdef CONFIG_SMP
static int oprofile_cpu_notifier(struct notifier_block *b, unsigned long action,
void *data)
{
@@ -491,7 +490,6 @@ static int oprofile_cpu_notifier(struct notifier_block *b, unsigned long action,
static struct notifier_block oprofile_cpu_nb = {
.notifier_call = oprofile_cpu_notifier
};
-#endif
#ifdef CONFIG_PM
@@ -701,9 +699,8 @@ int __init op_nmi_init(struct oprofile_operations *ops)
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 @@ void op_nmi_exit(void)
{
if (using_nmi) {
exit_sysfs();
-#ifdef CONFIG_SMP
unregister_cpu_notifier(&oprofile_cpu_nb);
-#endif
}
if (model->exit)
model->exit();
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|