diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 14:04:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 14:04:19 -0400 |
commit | 714f83d5d9f7c785f622259dad1f4fad12d64664 (patch) | |
tree | 20563541ae438e11d686b4d629074eb002a481b7 /kernel/tracepoint.c | |
parent | 8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc (diff) | |
parent | 645dae969c3b8651c5bc7c54a1835ec03820f85f (diff) |
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
tracing, net: fix net tree and tracing tree merge interaction
tracing, powerpc: fix powerpc tree and tracing tree interaction
ring-buffer: do not remove reader page from list on ring buffer free
function-graph: allow unregistering twice
trace: make argument 'mem' of trace_seq_putmem() const
tracing: add missing 'extern' keywords to trace_output.h
tracing: provide trace_seq_reserve()
blktrace: print out BLK_TN_MESSAGE properly
blktrace: extract duplidate code
blktrace: fix memory leak when freeing struct blk_io_trace
blktrace: fix blk_probes_ref chaos
blktrace: make classic output more classic
blktrace: fix off-by-one bug
blktrace: fix the original blktrace
blktrace: fix a race when creating blk_tree_root in debugfs
blktrace: fix timestamp in binary output
tracing, Text Edit Lock: cleanup
tracing: filter fix for TRACE_EVENT_FORMAT events
ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
x86: kretprobe-booster interrupt emulation code fix
...
Fix up trivial conflicts in
arch/parisc/include/asm/ftrace.h
include/linux/memory.h
kernel/extable.c
kernel/module.c
Diffstat (limited to 'kernel/tracepoint.c')
-rw-r--r-- | kernel/tracepoint.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 79602740bbb5..1ef5d3a601c7 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c | |||
@@ -272,12 +272,15 @@ static void disable_tracepoint(struct tracepoint *elem) | |||
272 | * | 272 | * |
273 | * Updates the probe callback corresponding to a range of tracepoints. | 273 | * Updates the probe callback corresponding to a range of tracepoints. |
274 | */ | 274 | */ |
275 | void tracepoint_update_probe_range(struct tracepoint *begin, | 275 | void |
276 | struct tracepoint *end) | 276 | tracepoint_update_probe_range(struct tracepoint *begin, struct tracepoint *end) |
277 | { | 277 | { |
278 | struct tracepoint *iter; | 278 | struct tracepoint *iter; |
279 | struct tracepoint_entry *mark_entry; | 279 | struct tracepoint_entry *mark_entry; |
280 | 280 | ||
281 | if (!begin) | ||
282 | return; | ||
283 | |||
281 | mutex_lock(&tracepoints_mutex); | 284 | mutex_lock(&tracepoints_mutex); |
282 | for (iter = begin; iter < end; iter++) { | 285 | for (iter = begin; iter < end; iter++) { |
283 | mark_entry = get_tracepoint(iter->name); | 286 | mark_entry = get_tracepoint(iter->name); |