dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ftrace: build fix 

no need to backmerge, only affects ftrace-enabled kernels. (which is
not the default)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar 2008-05-12 21:20:49 +02:00 committed by Thomas Gleixner
parent 5e3ca0ec76
commit 2577046740
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/trace/trace.c
View File

@ -1965,7 +1965,9 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
static cpumask_t mask;
static int start;
unsigned long flags;
#ifdef CONFIG_FTRACE
int ftrace_save;
#endif
int read = 0;
int cpu;
int len;
@ -2044,8 +2046,10 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
cpus_clear(mask);
local_irq_save(flags);
#ifdef CONFIG_FTRACE
ftrace_save = ftrace_enabled;
ftrace_enabled = 0;
#endif
smp_wmb();
for_each_possible_cpu(cpu) {
data = iter->tr->data[cpu];
@ -2087,7 +2091,9 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
data = iter->tr->data[cpu];
atomic_dec(&data->disabled);
}
#ifdef CONFIG_FTRACE
ftrace_enabled = ftrace_save;
#endif
local_irq_restore(flags);
/* Now copy what we have to the user */