diff --git a/[refs] b/[refs]
index ed80b4661df8..aebcdb12adde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b03f6489f9f27dc519a4c60ebf39cc7b8a58eae7
+refs/heads/master: cebbd3fb803603b12408458ba17c29ce1e15a5f2
diff --git a/trunk/include/linux/profile.h b/trunk/include/linux/profile.h
index 4081fa31081f..7e7087239af5 100644
--- a/trunk/include/linux/profile.h
+++ b/trunk/include/linux/profile.h
@@ -18,9 +18,11 @@ 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);
 #else
-#define create_prof_cpu_mask(x)			do { (void)(x); } while (0)
+static inline void create_prof_cpu_mask(struct proc_dir_entry *de)
+{
+}
 #endif
 
 enum profile_type {