ax25: netrom: rose: Fix timer oopses

[safe/jmp/linux-2.6] / include / linux / profile.h

diff --git a/include/linux/profile.h b/include/linux/profile.h
index 4081fa3..a0fc322 100644 (file)
--- a/include/linux/profile.h
+++ b/include/linux/profile.h
@@ -18,9 +18,17 @@ struct pt_regs;
 struct notifier_block;
 
 #if defined(CONFIG_PROFILING) && defined(CONFIG_PROC_FS)
-void create_prof_cpu_mask(struct proc_dir_entry *);
+void create_prof_cpu_mask(struct proc_dir_entry *de);
+int create_proc_profile(void);
 #else
-#define create_prof_cpu_mask(x)                        do { (void)(x); } while (0)
+static inline void create_prof_cpu_mask(struct proc_dir_entry *de)
+{
+}
+
+static inline int create_proc_profile(void)
+{
+       return 0;
+}
 #endif
 
 enum profile_type {
@@ -33,7 +41,8 @@ enum profile_type {
 extern int prof_on __read_mostly;
 
 /* init basic kernel profiler */
-void __init profile_init(void);
+int profile_init(void);
+int profile_setup(char *str);
 void profile_tick(int type);
 
 /*
@@ -82,9 +91,9 @@ struct pt_regs;
 
 #define prof_on 0
 
-static inline void profile_init(void)
+static inline int profile_init(void)
 {
-       return;
+       return 0;
 }
 
 static inline void profile_tick(int type)