]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit - kernel/trace/trace_entries.h
Merge commit 'perf/core' into perf/hw-breakpoint
authorFrederic Weisbecker <fweisbec@gmail.com>
Sat, 17 Oct 2009 23:09:09 +0000 (01:09 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Sat, 17 Oct 2009 23:12:33 +0000 (01:12 +0200)
commit0f8f86c7bdd1c954fbe153af437a0d91a6c5721a
tree94a8d419a470a4f9852ca397bb9bbe48db92ff5c
parentdca2d6ac09d9ef59ff46820d4f0c94b08a671202
parentf39cdf25bf77219676ec5360980ac40b1a7e144a
Merge commit 'perf/core' into perf/hw-breakpoint

Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
18 files changed:
arch/Kconfig
arch/x86/Kconfig
arch/x86/include/asm/processor.h
arch/x86/kernel/Makefile
arch/x86/kernel/process.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/signal.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/traps.c
arch/x86/kvm/x86.c
arch/x86/power/cpu.c
kernel/Makefile
kernel/trace/Kconfig
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_entries.h
samples/Kconfig
samples/Makefile