diff --git a/[refs] b/[refs]
index c6333de5135b..0e1d71208dd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f492d3f8385a98f828e8220d14492337dc29e07b
+refs/heads/master: 97d0bb8dcd8c2812e1927cdb51d7b1f9c98352b5
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index b331e216d8a1..63281228ce3e 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -238,9 +238,11 @@ extern void ftrace_enable_daemon(void);
 static inline void ftrace_release(void *start, unsigned long size) { }
 static inline int register_ftrace_command(struct ftrace_func_command *cmd)
 {
+	return -EINVAL;
 }
 static inline int unregister_ftrace_command(char *cmd_name)
 {
+	return -EINVAL;
 }
 #endif /* CONFIG_DYNAMIC_FTRACE */