Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c93f216b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y
  branch tracer: Fix for enabling branch profiling makes sparse unusable
  ftrace: Correct a text align for event format output
  Update /debug/tracing/README
  tracing/ftrace: alloc the started cpumask for the trace file
  tracing, x86: remove duplicated #include
  ftrace: Add check of sched_stopped for probe_sched_wakeup
  function-graph: add proper initialization for init task
  tracing/ftrace: fix missing include string.h
  tracing: fix incorrect return type of ns2usecs()
  tracing: remove CALLER_ADDR2 from wakeup tracer
  blktrace: fix pdu_len when tracing packet command requests
  blktrace: small cleanup in blk_msg_write()
  blktrace: NUL-terminate user space messages
  tracing: move scripts/trace/power.pl to scripts/tracing/power.pl
parents c61b79b6 ab3c9c68

arch/x86/kernel/ftrace.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ 




#include <asm/cacheflush.h>

#include <asm/cacheflush.h>

#include <asm/ftrace.h>

#include <asm/ftrace.h>

#include <linux/ftrace.h>

#include <asm/nops.h>

#include <asm/nops.h>

#include <asm/nmi.h>

#include <asm/nmi.h>

block/blk-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,7 @@ void blk_rq_init(struct request_queue *q, struct request *rq) 
	INIT_HLIST_NODE(&rq->hash);

	INIT_HLIST_NODE(&rq->hash);

	RB_CLEAR_NODE(&rq->rb_node);

	RB_CLEAR_NODE(&rq->rb_node);

	rq->cmd = rq->__cmd;

	rq->cmd = rq->__cmd;

	rq->cmd_len = BLK_MAX_CDB;

	rq->tag = -1;

	rq->tag = -1;

	rq->ref_count = 1;

	rq->ref_count = 1;

}

}

include/linux/compiler.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,8 @@ struct ftrace_branch_data { 
 * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code

 * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code

 * to disable branch tracing on a per file basis.

 * to disable branch tracing on a per file basis.

 */

 */

#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING)

#if defined(CONFIG_TRACE_BRANCH_PROFILING) \

    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)

void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);

void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);





#define likely_notrace(x)	__builtin_expect(!!(x), 1)

#define likely_notrace(x)	__builtin_expect(!!(x), 1)

include/linux/ftrace.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -356,6 +356,9 @@ struct ftrace_graph_ret { 




#ifdef CONFIG_FUNCTION_GRAPH_TRACER

#ifdef CONFIG_FUNCTION_GRAPH_TRACER





/* for init task */

#define INIT_FTRACE_GRAPH		.ret_stack = NULL



/*

/*

 * Stack of return addresses for functions

 * Stack of return addresses for functions

 * of a thread.

 * of a thread.
@@ -430,10 +433,11 @@ static inline void unpause_graph_tracing(void) 
{

{

	atomic_dec(&current->tracing_graph_pause);

	atomic_dec(&current->tracing_graph_pause);

}

}

#else

#else /* !CONFIG_FUNCTION_GRAPH_TRACER */





#define __notrace_funcgraph

#define __notrace_funcgraph

#define __irq_entry

#define __irq_entry

#define INIT_FTRACE_GRAPH





static inline void ftrace_graph_init_task(struct task_struct *t) { }

static inline void ftrace_graph_init_task(struct task_struct *t) { }

static inline void ftrace_graph_exit_task(struct task_struct *t) { }

static inline void ftrace_graph_exit_task(struct task_struct *t) { }
@@ -445,7 +449,7 @@ static inline int task_curr_ret_stack(struct task_struct *tsk) 




static inline void pause_graph_tracing(void) { }

static inline void pause_graph_tracing(void) { }

static inline void unpause_graph_tracing(void) { }

static inline void unpause_graph_tracing(void) { }

#endif

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */





#ifdef CONFIG_TRACING

#ifdef CONFIG_TRACING

#include <linux/sched.h>

#include <linux/sched.h>

include/linux/init_task.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/irqflags.h>

#include <linux/irqflags.h>

#include <linux/utsname.h>

#include <linux/utsname.h>

#include <linux/lockdep.h>

#include <linux/lockdep.h>

#include <linux/ftrace.h>

#include <linux/ipc.h>

#include <linux/ipc.h>

#include <linux/pid_namespace.h>

#include <linux/pid_namespace.h>

#include <linux/user_namespace.h>

#include <linux/user_namespace.h>
@@ -185,6 +186,7 @@ extern struct cred init_cred; 
	INIT_IDS							\

	INIT_IDS							\

	INIT_TRACE_IRQFLAGS						\

	INIT_TRACE_IRQFLAGS						\

	INIT_LOCKDEP							\

	INIT_LOCKDEP							\

	INIT_FTRACE_GRAPH						\

}

}