Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing...
Ingo Molnar [Fri, 13 Feb 2009 09:25:18 +0000 (10:25 +0100)]
1  2  3  4 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/process.c
include/linux/sched.h
kernel/sched.c
kernel/trace/ring_buffer.c
kernel/trace/trace_sysprof.c
mm/slab.c
mm/slob.c
mm/slub.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
@@@@@ -238,10 -238,10 -238,12 -247,7 +238,12 @@@@@ static int stack_trace_init(struct trac
    {
        sysprof_trace = tr;
    
   -    start_stack_trace(tr);
++ +    tracing_start_cmdline_record();
++ +
   +    mutex_lock(&sample_timer_lock);
   +    start_stack_timers();
   +    tracer_enabled = 1;
   +    mutex_unlock(&sample_timer_lock);
        return 0;
    }
    
diff --cc mm/slab.c
Simple merge
diff --cc mm/slob.c
Simple merge
diff --cc mm/slub.c
Simple merge