Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace

[mv-sheeva.git] / kernel / profile.c

diff --git a/kernel/profile.c b/kernel/profile.c
index 7f93a5042d3b6011cbc54c0e540e6d178f7e293e..60adefb59b5e24f4f3d916df1caab686f91bc9f4 100644 (file)
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -351,7 +351,7 @@ out:
        put_cpu();
 }
 
-static int __devinit profile_cpu_callback(struct notifier_block *info,
+static int __cpuinit profile_cpu_callback(struct notifier_block *info,
                                        unsigned long action, void *__cpu)
 {
        int node, cpu = (unsigned long)__cpu;
@@ -596,7 +596,7 @@ out_cleanup:
 #define create_hash_tables()                   ({ 0; })
 #endif
 
-int create_proc_profile(void)
+int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */
 {
        struct proc_dir_entry *entry;