From f63d95995273a3b70abcfca41c387976383a3ddc Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 22 Oct 2008 14:14:59 -0700
Subject: [PATCH] --- yaml --- r: 116971 b: refs/heads/master c:
 66f50ee3cee4c9d98eea0add6f439e6e5e0ca4a5 h: refs/heads/master i:   116969:
 2b3a0389b372dfe9bd288df55e74d5d9e22a5b8d   116967:
 4b0fb7d80aa4800bcae6b07705fcb31a4fa48914 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/profile.h | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8d71a128274c..d38a6577a712 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c8210427bd1b7efa1dabf93f4d2312f29908d8f
+refs/heads/master: 66f50ee3cee4c9d98eea0add6f439e6e5e0ca4a5
diff --git a/trunk/include/linux/profile.h b/trunk/include/linux/profile.h
index 570045053ce9..a0fc32279fc0 100644
--- a/trunk/include/linux/profile.h
+++ b/trunk/include/linux/profile.h
@@ -19,10 +19,16 @@ struct notifier_block;
 
 #if defined(CONFIG_PROFILING) && defined(CONFIG_PROC_FS)
 void create_prof_cpu_mask(struct proc_dir_entry *de);
+int create_proc_profile(void);
 #else
 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 {
@@ -37,7 +43,6 @@ extern int prof_on __read_mostly;
 /* init basic kernel profiler */
 int profile_init(void);
 int profile_setup(char *str);
-int create_proc_profile(void);
 void profile_tick(int type);
 
 /*