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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
kernel
/
profile.c
diff --git
a/kernel/profile.c
b/kernel/profile.c
index
68afe12
..
d5bd75e
100644
(file)
--- a/
kernel/profile.c
+++ b/
kernel/profile.c
@@
-13,7
+13,6
@@
* to resolve timer interrupt livelocks, William Irwin, Oracle, 2004
*/
* to resolve timer interrupt livelocks, William Irwin, Oracle, 2004
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/profile.h>
#include <linux/bootmem.h>
#include <linux/module.h>
#include <linux/profile.h>
#include <linux/bootmem.h>
@@
-299,7
+298,7
@@
out:
}
#ifdef CONFIG_HOTPLUG_CPU
}
#ifdef CONFIG_HOTPLUG_CPU
-static int profile_cpu_callback(struct notifier_block *info,
+static int
__devinit
profile_cpu_callback(struct notifier_block *info,
unsigned long action, void *__cpu)
{
int node, cpu = (unsigned long)__cpu;
unsigned long action, void *__cpu)
{
int node, cpu = (unsigned long)__cpu;