diff options
| author | Ingo Molnar | 2009-09-07 08:19:51 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2009-09-07 08:19:51 +0200 |
| commit | a1922ed661ab2c1637d0b10cde933bd9cd33d965 (patch) | |
| tree | 0f1777542b385ebefd30b3586d830fd8ed6fda5b /arch/Kconfig | |
| parent | tracing/ksym_tracer: support quick clear for ksym_trace_filter -- v2 (diff) | |
| parent | Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | kernel-qcow2-linux-a1922ed661ab2c1637d0b10cde933bd9cd33d965.tar.gz kernel-qcow2-linux-a1922ed661ab2c1637d0b10cde933bd9cd33d965.tar.xz kernel-qcow2-linux-a1922ed661ab2c1637d0b10cde933bd9cd33d965.zip | |
Merge branch 'tracing/core' into tracing/hw-breakpoints
Conflicts:
arch/Kconfig
kernel/trace/trace.h
Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 1adf2d0e6356..c72f18fde319 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -116,3 +116,5 @@ config HAVE_DEFAULT_NO_SPIN_MUTEXES config HAVE_HW_BREAKPOINT bool + +source "kernel/gcov/Kconfig" |