From aec1e97d806f1862f47e21b3696c015d61caedf6 Mon Sep 17 00:00:00 2001
From: Huang Ying <ying.huang@intel.com>
Date: Mon, 18 Aug 2008 16:24:56 +0800
Subject: [PATCH] --- yaml --- r: 116594 b: refs/heads/master c:
 3700273586ee6a58b95dd07d9f8a02db4a9b476f h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/ftrace.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a0ec369d7e15..d9b8cee07585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99ecdc43bc17faf5fa571db8569df171ecd0e5b8
+refs/heads/master: 3700273586ee6a58b95dd07d9f8a02db4a9b476f
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index 36c439927ff1..8b4cf38c80d2 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -99,9 +99,11 @@ static inline void tracer_disable(void)
 #endif
 }
 
-/* Ftrace disable/restore without lock. Some synchronization mechanism
+/*
+ * Ftrace disable/restore without lock. Some synchronization mechanism
  * must be used to prevent ftrace_enabled to be changed between
- * disable/restore. */
+ * disable/restore.
+ */
 static inline int __ftrace_enabled_save(void)
 {
 #ifdef CONFIG_FTRACE