Patches contributed by Eötvös Lorand University
commit 3272cab4063467410802367a8d69f06c65b2a866
Merge: f629299b544b 140d0b2108fa
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Aug 5 10:32:54 2011 +0200
Merge branch 'linus' into perf/urgent
Merge reason: Include most of the merge window trees, to do fixes on top.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit d7619fe39d9769b4d4545cc511c891deea18ae08
Merge: 9ea71503a8ed ed8f37370d83
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Aug 4 09:09:27 2011 +0200
Merge branch 'linus' into core/urgent
commit 994bf1c92270e3d7731ea08f1d1bd7a668314e60
Merge: bd96efe17d94 cf6ace16a3cd
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 21 17:59:54 2011 +0200
Merge branch 'linus' into sched/core
Merge reason: pick up the latest scheduler fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 40bcea7bbe8fe452a2d272e2ffd3dea281eec9ff
Merge: 492f73a303b4 14a8fd7ceea6
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 21 09:32:40 2011 +0200
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
commit 492f73a303b488ffd67097b2351d54aa6e6c7c73
Merge: e08fbb78f03f f7bc8b61f657
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 21 09:29:14 2011 +0200
Merge branch 'perf/urgent' into perf/core
Merge reason: pick up the latest fixes - they won't make v3.0.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc kernel/trace/trace_events.c
index 4d7e1498ae91,3e2a7c91c548..581876f9f387
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@@ -560,12 -598,22 +589,13 @@@ static ssize_
system_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
loff_t *ppos)
{
- const char *system = filp->private_data;
+ struct event_subsystem *system = filp->private_data;
+ const char *name = NULL;
unsigned long val;
- char buf[64];
ssize_t ret;
- if (cnt >= sizeof(buf))
- return -EINVAL;
-
- if (copy_from_user(&buf, ubuf, cnt))
- return -EFAULT;
-
- buf[cnt] = 0;
-
- ret = strict_strtoul(buf, 10, &val);
- if (ret < 0)
+ ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
+ if (ret)
return ret;
ret = tracing_update_buffers();
commit d1e9ae47a0285d3f1699e8219ce50f656243b93f
Merge: e6625fa48e65 a841796f11c9
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jul 20 20:59:26 2011 +0200
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
commit b395fb36d59e17b9335805c10fa30fc51c8a94c6
Merge: fe0d42203cb5 6b385b46ee17
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 7 12:56:44 2011 +0200
Merge branch 'iommu-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into core/iommu
commit 931da6137e8e8c622f59251e8b645467aea293f1
Merge: 5d67be97f890 1fd8df2c3970
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Jul 5 11:55:43 2011 +0200
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
commit 9f8b6a6cf0ee78de87ebe1e87f54bec1c1741ef7
Merge: 729aa21ab85b a406ab6d77ea
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jul 4 12:27:28 2011 +0200
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
commit 729aa21ab85b5d24f3c2b1e581d71c2333f46628
Merge: 29dfc4fd7e79 a2bbe75089d5
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jul 3 20:39:40 2011 +0200
Merge branch 'perf/stacktrace' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core