Patches contributed by Eötvös Lorand University
commit 0806ebd974590ab24ab357d5d87db744e56bfe13
Merge: 090f7204dfdb feef47d0cb53
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon May 3 08:29:35 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
diff --cc tools/perf/util/trace-event-read.c
index 43f19c1fed3a,46066391288a..cb54cd002f49
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@@ -51,8 -51,13 +51,14 @@@ static int long_size
static unsigned long page_size;
static ssize_t calc_data_size;
+static bool repipe;
+ /* If it fails, the next read will report it */
+ static void skip(int size)
+ {
+ lseek(input_fd, size, SEEK_CUR);
+ }
+
static int do_read(int fd, void *buf, int size)
{
int rsize = size;
commit bc4b473f1aa2ef785ccfd890a24a1de5a6660f98
Merge: 3ca50496c267 1c6a800cde3b
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Apr 30 09:58:05 2010 +0200
Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 3ca50496c2677a2b3fdd3ede86660fd1433beac6
Merge: 462b04e28a7e 66f41d4c5c8a
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Apr 30 09:56:41 2010 +0200
Merge commit 'v2.6.34-rc6' into perf/core
Merge reason: update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 462b04e28a7ec1339c892117c3f20a40e55d0e83
Merge: cfadf9d4ac4b f93830fbb06b
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Apr 27 11:16:54 2010 +0200
Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 77a7f2e94e6998e307917fe63fa4b6d5162d44e9
Merge: ac0053fd51d2 cecbca96da38
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Apr 23 11:25:31 2010 +0200
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
commit 4093b150e52e6da20e9496df8aa007423952ae42
Merge: 70bce3ba7754 fead7960f0b6
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Apr 23 11:11:38 2010 +0200
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf into perf/core
commit 70bce3ba77540ebe77b8c0e1ac38d281a23fbb5e
Merge: 6eca8cc35b50 d5a30458a905
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Apr 23 11:10:28 2010 +0200
Merge branch 'linus' into perf/core
Merge reason: merge the latest fixes, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit ac0053fd51d2bac09a7d4b4a59f6dac863bd4373
Merge: b15c7b1cee11 01bf0b64579e
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Apr 21 09:47:00 2010 +0200
Merge commit 'v2.6.34-rc5' into tracing/core
Merge reason: pick up latest -rc's.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit b257c14ceb1194a6181144210056d38f22127189
Merge: 371fd7e7a56a 2ba3abd8186f
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Apr 15 09:35:24 2010 +0200
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc kernel/sched_debug.c
index 0932c5c45b34,9b49db144037..9cf1baf6616a
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@@ -484,10 -491,31 +484,6 @@@ void proc_sched_show_task(struct task_s
void proc_sched_set_task(struct task_struct *p)
{
#ifdef CONFIG_SCHEDSTATS
- p->se.wait_max = 0;
- p->se.wait_sum = 0;
- p->se.wait_count = 0;
- p->se.iowait_sum = 0;
- p->se.iowait_count = 0;
- p->se.sleep_max = 0;
- p->se.sum_sleep_runtime = 0;
- p->se.block_max = 0;
- p->se.exec_max = 0;
- p->se.slice_max = 0;
- p->se.nr_migrations = 0;
- p->se.nr_migrations_cold = 0;
- p->se.nr_failed_migrations_affine = 0;
- p->se.nr_failed_migrations_running = 0;
- p->se.nr_failed_migrations_hot = 0;
- p->se.nr_forced_migrations = 0;
- p->se.nr_wakeups = 0;
- p->se.nr_wakeups_sync = 0;
- p->se.nr_wakeups_migrate = 0;
- p->se.nr_wakeups_local = 0;
- p->se.nr_wakeups_remote = 0;
- p->se.nr_wakeups_affine = 0;
- p->se.nr_wakeups_affine_attempts = 0;
- p->se.nr_wakeups_passive = 0;
- p->se.nr_wakeups_idle = 0;
- p->sched_info.bkl_count = 0;
+ memset(&p->se.statistics, 0, sizeof(p->se.statistics));
#endif
- p->se.sum_exec_runtime = 0;
- p->se.prev_sum_exec_runtime = 0;
- p->nvcsw = 0;
- p->nivcsw = 0;
}
commit b5a80b7e91d6c067339e4d81a0176a835e9bf910
Merge: 84b13fd59652 f6c903f5856f
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Apr 15 09:16:51 2010 +0200
Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core