Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

2aa61274

Commit 2aa61274 authored 14 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'perf/urgent' into perf/core


Merge reason: Pick up pending fixes before applying dependent new changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

parents 359d5106 5e11637e

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/kernel/cpu/perf_event.c 46 additions, 13 deletions

arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_intel.c 9 additions, 6 deletions

arch/x86/kernel/cpu/perf_event_intel.c
arch/x86/kernel/cpu/perf_event_p4.c 1 addition, 1 deletion

arch/x86/kernel/cpu/perf_event_p4.c
arch/x86/oprofile/nmi_int.c 17 additions, 5 deletions

arch/x86/oprofile/nmi_int.c
drivers/oprofile/buffer_sync.c 14 additions, 13 deletions

drivers/oprofile/buffer_sync.c
drivers/oprofile/cpu_buffer.c 0 additions, 2 deletions

drivers/oprofile/cpu_buffer.c
kernel/perf_event.c 25 additions, 7 deletions

kernel/perf_event.c
kernel/trace/ftrace.c 12 additions, 5 deletions

kernel/trace/ftrace.c
kernel/trace/trace_event_perf.c 3 additions, 0 deletions

kernel/trace/trace_event_perf.c
kernel/trace/trace_kprobe.c 25 additions, 18 deletions

kernel/trace/trace_kprobe.c
kernel/watchdog.c 12 additions, 5 deletions

kernel/watchdog.c
tools/perf/util/probe-event.c 1 addition, 0 deletions

tools/perf/util/probe-event.c
tools/perf/util/probe-finder.c 29 additions, 13 deletions

tools/perf/util/probe-finder.c

with 194 additions and 88 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