Merge branch 'perf-urgent-for-linus' of...
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits) perf: Fix SIGIO handling perf top: Don't stop if no kernel symtab is found perf top: Handle kptr_restrict perf top: Remove unused macro perf events: initialize fd array to -1 instead of 0 perf tools: Make sure kptr_restrict warnings fit 80 col terms perf tools: Fix build on older systems perf symbols: Handle /proc/sys/kernel/kptr_restrict perf: Remove duplicate headers ftrace: Add internal recursive checks tracing: Update btrfs's tracepoints to use u64 interface tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine ftrace: Set ops->flag to enabled even on static function tracing tracing: Have event with function tracer check error return ftrace: Have ftrace_startup() return failure code jump_label: Check entries limit in __jump_label_update ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM scripts/tags.sh: Add magic for trace-events for etags too scripts/tags.sh: Fix ctags for DEFINE_EVENT() x86/ftrace: Fix compiler warning in ftrace.c ...
No related branches found
No related tags found
Showing
- arch/blackfin/mm/maccess.c 2 additions, 2 deletionsarch/blackfin/mm/maccess.c
- arch/s390/mm/maccess.c 2 additions, 2 deletionsarch/s390/mm/maccess.c
- arch/x86/kernel/ftrace.c 6 additions, 6 deletionsarch/x86/kernel/ftrace.c
- arch/x86/oprofile/op_model_amd.c 54 additions, 41 deletionsarch/x86/oprofile/op_model_amd.c
- drivers/oprofile/event_buffer.h 1 addition, 1 deletiondrivers/oprofile/event_buffer.h
- drivers/oprofile/oprof.c 1 addition, 1 deletiondrivers/oprofile/oprof.c
- include/linux/ftrace_event.h 12 additions, 0 deletionsinclude/linux/ftrace_event.h
- include/linux/sched.h 1 addition, 1 deletioninclude/linux/sched.h
- include/linux/uaccess.h 4 additions, 4 deletionsinclude/linux/uaccess.h
- include/trace/events/btrfs.h 2 additions, 2 deletionsinclude/trace/events/btrfs.h
- include/trace/ftrace.h 13 additions, 0 deletionsinclude/trace/ftrace.h
- kernel/events/core.c 8 additions, 0 deletionskernel/events/core.c
- kernel/jump_label.c 13 additions, 5 deletionskernel/jump_label.c
- kernel/trace/ftrace.c 24 additions, 7 deletionskernel/trace/ftrace.c
- kernel/trace/ring_buffer.c 5 additions, 5 deletionskernel/trace/ring_buffer.c
- kernel/trace/trace.h 15 additions, 0 deletionskernel/trace/trace.h
- kernel/trace/trace_events.c 6 additions, 1 deletionkernel/trace/trace_events.c
- kernel/trace/trace_output.c 27 additions, 0 deletionskernel/trace/trace_output.c
- kernel/watchdog.c 3 additions, 6 deletionskernel/watchdog.c
- mm/maccess.c 4 additions, 4 deletionsmm/maccess.c
Loading
Please register or sign in to comment