Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/function-graph-tracer...

diff --cc include/linux/ftrace.h
index 7854d87b97b20332040354f085002f9053f36e9a,7854d87b97b20332040354f085002f9053f36e9a,f9792c0d73f60f1eafb1064b6646ec9b62602ef1,0df2886662017aa24d236ebc6ab634b87becf800..afba918c623c5a2ab86e4ac8363e1b24e9c95c3f
--- 1/include/linux/ftrace.h
--- 2/include/linux/ftrace.h
--- 3/include/linux/ftrace.h
--- 4/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@@@@ -311,7 -311,7 -316,15 -311,36 +316,44 @@@@@ ftrace_init_module(struct module *mod
                   unsigned long *start, unsigned long *end) { }
    #endif
    
+++ enum {
+++     POWER_NONE = 0,
+++     POWER_CSTATE = 1,
+++     POWER_PSTATE = 2,
+++ };
+++ 
+++ struct power_trace {
+++ #ifdef CONFIG_POWER_TRACER
+++     ktime_t                 stamp;
+++     ktime_t                 end;
+++     int                     type;
+++     int                     state;
+++ #endif
+++ };
+++ 
+++ #ifdef CONFIG_POWER_TRACER
+++ extern void trace_power_start(struct power_trace *it, unsigned int type,
+++                                     unsigned int state);
+++ extern void trace_power_mark(struct power_trace *it, unsigned int type,
+++                                     unsigned int state);
+++ extern void trace_power_end(struct power_trace *it);
+++ #else
+++ static inline void trace_power_start(struct power_trace *it, unsigned int type,
+++                                     unsigned int state) { }
+++ static inline void trace_power_mark(struct power_trace *it, unsigned int type,
+++                                     unsigned int state) { }
+++ static inline void trace_power_end(struct power_trace *it) { }
+++ #endif
+++ 
++  
++ +/*
++ + * Structure that defines an entry function trace.
++ + */
++ +struct ftrace_graph_ent {
++ +    unsigned long func; /* Current function */
++ +    int depth;
++ +};
   +
    /*
     * Structure that defines a return function trace.
     */

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc kernel/trace/Makefile
index cef4bcb4e822b06210413d3c6e6e8af810e9640a,cef4bcb4e822b06210413d3c6e6e8af810e9640a,08c5fe6ddc09b5dca7036f921e34d1afec9a7103,acaa06553ecaf149f505bf1921fab80b71a64059..62dc561b6676ab57ced3b65f5804c0e50f31730a
--- 1/kernel/trace/Makefile
--- 2/kernel/trace/Makefile
--- 3/kernel/trace/Makefile
--- 4/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@@@@ -29,8 -29,8 -29,8 -29,9 +29,9 @@@@@ obj-$(CONFIG_NOP_TRACER) += trace_nop.
    obj-$(CONFIG_STACK_TRACER) += trace_stack.o
    obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
    obj-$(CONFIG_BOOT_TRACER) += trace_boot.o
-- -obj-$(CONFIG_FUNCTION_RET_TRACER) += trace_functions_return.o
++ +obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += trace_functions_graph.o
    obj-$(CONFIG_TRACE_BRANCH_PROFILING) += trace_branch.o
    obj-$(CONFIG_BTS_TRACER) += trace_bts.o
+++ obj-$(CONFIG_POWER_TRACER) += trace_power.o
    
    libftrace-y := ftrace.o

diff --cc kernel/trace/trace.h
index 3abd645e8af2cde9489ef65c87f68ba357741eb2,3abd645e8af2cde9489ef65c87f68ba357741eb2,7adacf349ef7eea82a62a1409bff50ff62c12ba0,4c453778a6abc2f290a16702fb557ef33e7a3c3e..f96f4e787ff39fb8310ddc0efdc5845ccd43f30c
--- 1/kernel/trace/trace.h
--- 2/kernel/trace/trace.h
--- 3/kernel/trace/trace.h
--- 4/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@@@ -25,9 -25,9 -25,10 -25,10 +25,11 @@@@@ enum trace_type 
        TRACE_BRANCH,
        TRACE_BOOT_CALL,
        TRACE_BOOT_RET,
-- -    TRACE_FN_RET,
++ +    TRACE_GRAPH_RET,
++ +    TRACE_GRAPH_ENT,
        TRACE_USER_STACK,
        TRACE_BTS,
+++     TRACE_POWER,
    
        __TRACE_LAST_TYPE
    };
@@@@@ -264,8 -264,8 -267,11 -270,9 +273,12 @@@@@ extern void __ftrace_bad_type(void)
                IF_ASSIGN(var, ent, struct trace_boot_call, TRACE_BOOT_CALL);\
                IF_ASSIGN(var, ent, struct trace_boot_ret, TRACE_BOOT_RET);\
                IF_ASSIGN(var, ent, struct trace_branch, TRACE_BRANCH); \
-- -            IF_ASSIGN(var, ent, struct ftrace_ret_entry, TRACE_FN_RET);\
++ +            IF_ASSIGN(var, ent, struct ftrace_graph_ent_entry,      \
++ +                      TRACE_GRAPH_ENT);             \
++ +            IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,      \
++ +                      TRACE_GRAPH_RET);             \
                IF_ASSIGN(var, ent, struct bts_entry, TRACE_BTS);\
+++             IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
                __ftrace_bad_type();                                    \
        } while (0)