Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

b971f061

Commit b971f061 authored 14 years ago by Robert Richter

Downloads
- Plain Diff

Merge commit 'tip/tracing/core' into oprofile/core


Conflicts:
	drivers/oprofile/cpu_buffer.c

Signed-off-by: Robert Richter <robert.richter@amd.com>

parents cb6e943c c1ab9cab

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

drivers/oprofile/cpu_buffer.c 1 addition, 1 deletion

drivers/oprofile/cpu_buffer.c
include/linux/ftrace_event.h 1 addition, 0 deletions

include/linux/ftrace_event.h
include/linux/module.h 2 additions, 4 deletions

include/linux/module.h
include/linux/ring_buffer.h 4 additions, 2 deletions

include/linux/ring_buffer.h
include/trace/events/module.h 11 additions, 7 deletions

include/trace/events/module.h
include/trace/events/signal.h 22 additions, 30 deletions

include/trace/events/signal.h
include/trace/ftrace.h 19 additions, 14 deletions

include/trace/ftrace.h
kernel/module.c 4 additions, 4 deletions

kernel/module.c
kernel/trace/ring_buffer.c 95 additions, 6 deletions

kernel/trace/ring_buffer.c
kernel/trace/ring_buffer_benchmark.c 1 addition, 1 deletion

kernel/trace/ring_buffer_benchmark.c
kernel/trace/trace.c 22 additions, 8 deletions

kernel/trace/trace.c
kernel/trace/trace_functions_graph.c 3 additions, 2 deletions

kernel/trace/trace_functions_graph.c
kernel/trace/trace_selftest.c 1 addition, 1 deletion

kernel/trace/trace_selftest.c

with 186 additions and 80 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment