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

Commit c0c50b54 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:
  tracing/function-profiler: do not free per cpu variable stat
  tracing/events: Move TRACE_SYSTEM outside of include guard
parents a376d446 6ab5d668

fs/gfs2/trace_gfs2.h

+4 −4
Original line number Diff line number Diff line 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM gfs2



#if !defined(_TRACE_GFS2_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_GFS2_H



#include <linux/tracepoint.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM gfs2

#define TRACE_INCLUDE_FILE trace_gfs2



#include <linux/fs.h>

#include <linux/buffer_head.h>

#include <linux/dlmconstants.h>
@@ -403,5 +402,6 @@ TRACE_EVENT(gfs2_block_alloc, 
/* This part must be outside protection */

#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_gfs2

#include <trace/define_trace.h>

include/trace/events/block.h

+3 −3
Original line number Diff line number Diff line 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM block



#if !defined(_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_BLOCK_H
@@ -5,9 +8,6 @@ 
#include <linux/blkdev.h>

#include <linux/tracepoint.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM block



TRACE_EVENT(block_rq_abort,



	TP_PROTO(struct request_queue *q, struct request *rq),

include/trace/events/ext4.h

+3 −3
Original line number Diff line number Diff line 
#if !defined(_TRACE_EXT4_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_EXT4_H



#undef TRACE_SYSTEM

#define TRACE_SYSTEM ext4



#if !defined(_TRACE_EXT4_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_EXT4_H



#include <linux/writeback.h>

#include "../../../fs/ext4/ext4.h"

#include "../../../fs/ext4/mballoc.h"

include/trace/events/irq.h

+3 −3
Original line number Diff line number Diff line 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM irq



#if !defined(_TRACE_IRQ_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_IRQ_H



#include <linux/tracepoint.h>

#include <linux/interrupt.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM irq



#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq }

#define show_softirq_name(val)			\

	__print_symbolic(val,			\

include/trace/events/jbd2.h

+3 −3
Original line number Diff line number Diff line 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM jbd2



#if !defined(_TRACE_JBD2_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_JBD2_H



#include <linux/jbd2.h>

#include <linux/tracepoint.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM jbd2



TRACE_EVENT(jbd2_checkpoint,



	TP_PROTO(journal_t *journal, int result),