git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
msr.c
diff --git
a/arch/i386/kernel/msr.c
b/arch/i386/kernel/msr.c
index
d535cdb
..
1d0a55e
100644
(file)
--- a/
arch/i386/kernel/msr.c
+++ b/
arch/i386/kernel/msr.c
@@
-24,6
+24,7
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/errno.h>
@@
-250,9
+251,7
@@
static int msr_class_device_create(int i)
return err;
}
return err;
}
-#ifdef CONFIG_HOTPLUG_CPU
-static int msr_class_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int __devinit msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
{
unsigned int cpu = (unsigned long)hcpu;
@@
-267,11
+266,10
@@
static int msr_class_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
return NOTIFY_OK;
}
-static struct notifier_block
__cpuinitdata
msr_class_cpu_notifier =
+static struct notifier_block msr_class_cpu_notifier =
{
.notifier_call = msr_class_cpu_callback,
};
{
.notifier_call = msr_class_cpu_callback,
};
-#endif
static int __init msr_init(void)
{
static int __init msr_init(void)
{
@@
-294,7
+292,7
@@
static int __init msr_init(void)
if (err != 0)
goto out_class;
}
if (err != 0)
goto out_class;
}
- register_
hot
cpu_notifier(&msr_class_cpu_notifier);
+ register_cpu_notifier(&msr_class_cpu_notifier);
err = 0;
goto out;
err = 0;
goto out;
@@
-317,7
+315,7
@@
static void __exit msr_exit(void)
class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
class_destroy(msr_class);
unregister_chrdev(MSR_MAJOR, "cpu/msr");
class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
class_destroy(msr_class);
unregister_chrdev(MSR_MAJOR, "cpu/msr");
- unregister_
hot
cpu_notifier(&msr_class_cpu_notifier);
+ unregister_cpu_notifier(&msr_class_cpu_notifier);
}
module_init(msr_init);
}
module_init(msr_init);