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

[linux-2.6-block.git] / kernel / profile.c

diff --git a/kernel/profile.c b/kernel/profile.c
index dc41827fbfeea474c809ebc3adb6e54edcedb861..60adefb59b5e24f4f3d916df1caab686f91bc9f4 100644 (file)
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = {
 };
 
 #ifdef CONFIG_SMP
-static inline void profile_nop(void *unused)
+static void profile_nop(void *unused)
 {
 }