diff --git a/[refs] b/[refs]
index 5ae5bdc560b6..6ad4f9a22916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52f4f324c727e77507ae0490b08fc92e140ba57d
+refs/heads/master: 8cf7d362c0dc2cfda2146d184eedc32a530c8020
diff --git a/trunk/include/linux/profile.h b/trunk/include/linux/profile.h
index 570045053ce9..e3eca8577a38 100644
--- a/trunk/include/linux/profile.h
+++ b/trunk/include/linux/profile.h
@@ -37,7 +37,14 @@ extern int prof_on __read_mostly;
 /* init basic kernel profiler */
 int profile_init(void);
 int profile_setup(char *str);
+#ifdef CONFIG_PROC_FS
 int create_proc_profile(void);
+#else
+static inline int create_proc_profile(void)
+{
+	return 0;
+}
+#endif
 void profile_tick(int type);
 
 /*