Skip to content

Commit

Permalink
oprofile/x86: remove CONFIG_SMP macros
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Robert Richter committed May 4, 2010
1 parent 2623a1d commit 216f3d9
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions arch/x86/oprofile/nmi_int.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 216f3d9

Please sign in to comment.