Patches contributed by Eötvös Lorand University
commit 888a8a3e9d79cbb9d83e53955f684998248580ec
Merge: cfff2d909cbd b06b3d49699a
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Mar 4 10:40:22 2011 +0100
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 9848caf26dafefcec7881f0e3c35fc81c454ba59
Merge: 768a06e2ca49 9826e8329bc1
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 23 15:50:13 2011 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit d927dc937910ad8c7350266cac70e42a5f0b48cf
Merge: 46e49b3836c7 f5412be59960
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 23 11:31:34 2011 +0100
Merge commit 'v2.6.38-rc6' into sched/core
Merge reason: Pick up the latest fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit e4cc9f4a207aeb819f358114eb23a04547d4807c
Merge: e9345aab6753 668b8788f497
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Feb 18 08:25:05 2011 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit e9345aab675382176740bc8a2c6d3caf1510e46d
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Feb 18 08:09:49 2011 +0100
Revert "tracing: Add unstable sched clock note to the warning"
This reverts commit 5e38ca8f3ea423442eaafe1b7e206084aa38120a.
Breaks the build of several !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
architectures.
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Message-ID: <20110217171823.GB17058@elte.hu>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 7739893a1d0a..bd1c35a4fbcc 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2163,14 +2163,10 @@ rb_reserve_next_event(struct ring_buffer *buffer,
delta = diff;
if (unlikely(test_time_stamp(delta))) {
WARN_ONCE(delta > (1ULL << 59),
- KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n%s",
+ KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n",
(unsigned long long)delta,
(unsigned long long)ts,
- (unsigned long long)cpu_buffer->write_stamp,
- sched_clock_stable ? "" :
- "If you just came from a suspend/resume,\n"
- "please switch to the trace global clock:\n"
- " echo global > /sys/kernel/debug/tracing/trace_clock\n");
+ (unsigned long long)cpu_buffer->write_stamp);
add_timestamp = 1;
}
}
commit bee96907383e71d3996ba2bd0682fefaa492d942
Merge: 5beda5f6e4e4 8737ebdea023
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Feb 17 14:46:35 2011 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 5beda5f6e4e4523e8dbe596bf163a01b45776808
Merge: ba3dd36c6775 6752ab4a9c30
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Feb 17 14:11:15 2011 +0100
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
commit a3ec4a603faf4244e275bf11b467aad092dfbd8a
Merge: 51563cd53c4b 85e2efbb1db9
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 16 13:33:35 2011 +0100
Merge commit 'v2.6.38-rc5' into core/locking
Merge reason: pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 48fa4b8ecf683f5e411303553da9e186e8b8406e
Merge: d95f41220065 85e2efbb1db9
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 16 13:31:51 2011 +0100
Merge commit 'v2.6.38-rc5' into sched/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit b00560f2d4de69bb12f66f9605985b516df98d77
Merge: bf1af3a80950 4fe757dd48a9
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 16 13:27:18 2011 +0100
Merge branch 'perf/urgent' into perf/core
Merge reason: we need to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu>