lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.32-rc6' into perf/core

Browse Source 
Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-11-04 11:54:15 +01:00
parent 6d7aa9d721 b419148e56
commit a2e7127153
710 changed files with 20571 additions and 7304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/trace/trace.c
View File

@ -2440,7 +2440,7 @@ tracing_trace_options_write(struct file *filp, const char __user *ubuf,
return ret;
}
filp->f_pos += cnt;
*ppos += cnt;
return cnt;
}
@ -2582,7 +2582,7 @@ tracing_ctrl_write(struct file *filp, const char __user *ubuf,
}
mutex_unlock(&trace_types_lock);
filp->f_pos += cnt;
*ppos += cnt;
return cnt;
}
@ -2764,7 +2764,7 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf,
if (err)
return err;
filp->f_pos += ret;
*ppos += ret;
return ret;
}
@ -3299,7 +3299,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
}
}
filp->f_pos += cnt;
*ppos += cnt;
/* If check pages failed, return ENOMEM */
if (tracing_disabled)