Merge remote-tracking branch 'ftrace/for-next'

[deliverable/linux.git] / include / linux / ftrace.h

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 6f93ac46e7f0a52f6091755ebf879f14dc80c525..b3d34d3e0e7efe5d5bd55d7b05616974831c636c 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -794,7 +794,9 @@ struct ftrace_ret_stack {
        unsigned long ret;
        unsigned long func;
        unsigned long long calltime;
+#ifdef CONFIG_FUNCTION_PROFILER
        unsigned long long subtime;
+#endif
 #ifdef HAVE_FUNCTION_GRAPH_FP_TEST
        unsigned long fp;
 #endif