Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'core/signal...

[linux-2.6-omap-h63xx.git] / kernel / profile.c

diff --git a/kernel/profile.c b/kernel/profile.c
index a9e422df6bf63e28648432efa7f0503aa09ffe8f..5b7d1ac7124c97e884d25c57bbf770f9f858d26f 100644 (file)
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -102,7 +102,7 @@ int profile_setup(char *str)
 __setup("profile=", profile_setup);
 
 
-int profile_init(void)
+int __ref profile_init(void)
 {
        int buffer_bytes;
        if (!prof_on)
@@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = {
 };
 
 #ifdef CONFIG_SMP
-static void __init profile_nop(void *unused)
+static inline void profile_nop(void *unused)
 {
 }