GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'tracing/urgent' into tracing/ftrace

Browse source 
Conflicts:
	kernel/trace/trace.c
This commit is contained in:
Ingo Molnar 2008-11-11 09:40:18 +01:00
commit e0cb4ebcd9
228 changed files with 4407 additions and 1462 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kernel/trace/trace.c
View file

@ -2835,7 +2835,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
{
unsigned long val;
char buf[64];
int ret;
int ret, cpu;
if (cnt >= sizeof(buf))
return -EINVAL;
@ -2857,6 +2857,14 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
tracing_stop();
/* disable all cpu buffers */
for_each_tracing_cpu(cpu) {
if (global_trace.data[cpu])
atomic_inc(&global_trace.data[cpu]->disabled);
if (max_tr.data[cpu])
atomic_inc(&max_tr.data[cpu]->disabled);
}
if (val != global_trace.entries) {
ret = ring_buffer_resize(global_trace.buffer, val);
if (ret < 0) {
@ -2888,6 +2896,13 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
if (tracing_disabled)
cnt = -ENOMEM;
out:
for_each_tracing_cpu(cpu) {
if (global_trace.data[cpu])
atomic_dec(&global_trace.data[cpu]->disabled);
if (max_tr.data[cpu])
atomic_dec(&max_tr.data[cpu]->disabled);
}
tracing_start();
max_tr.entries = global_trace.entries;
mutex_unlock(&trace_types_lock);