diff --git a/[refs] b/[refs]
index ddbccd5aabd2..245b5bc283b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e32d89569128e76bdf84867be0928902ca9f7555
+refs/heads/master: 6b2539302bee8e88c99e3c7d80c16a04dbe5e2ad
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
index 8b81b4d727bd..b4b7b735184d 100644
--- a/trunk/kernel/trace/trace.h
+++ b/trunk/kernel/trace/trace.h
@@ -529,7 +529,11 @@ static inline int ftrace_graph_addr(unsigned long addr)
 #else
 static inline int ftrace_trace_addr(unsigned long addr)
 {
-	return 1
+	return 1;
+}
+static inline int ftrace_graph_addr(unsigned long addr)
+{
+	return 1;
 }
 #endif /* CONFIG_DYNAMIC_FTRACE */