Patches contributed by Eötvös Lorand University
commit 0087aabd6a3744c28114240776918f5d15e46b98
Merge: cc0104e877ff cc51a0fca666
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Dec 14 17:12:37 2009 +0100
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
commit cc0104e877fff32865a67b256d3a9ce52ff15790
Merge: 16620e0f1990 f40542532e96
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Dec 14 09:16:49 2009 +0100
Merge branch 'linus' into tracing/urgent
Conflicts:
kernel/trace/trace_kprobe.c
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit b9889ed1ddeca5a3f3569c8de7354e9e97d803ae
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 10 20:32:39 2009 +0100
sched: Remove forced2_migrations stats
This build warning:
kernel/sched.c: In function 'set_task_cpu':
kernel/sched.c:2070: warning: unused variable 'old_rq'
Made me realize that the forced2_migrations stat looks pretty
pointless (and a misnomer) - remove it.
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ee9f200d12d3..87b89a827f0c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1174,7 +1174,6 @@ struct sched_entity {
u64 nr_failed_migrations_running;
u64 nr_failed_migrations_hot;
u64 nr_forced_migrations;
- u64 nr_forced2_migrations;
u64 nr_wakeups;
u64 nr_wakeups_sync;
diff --git a/kernel/sched.c b/kernel/sched.c
index 36cc05a76947..bc68037f3199 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2067,7 +2067,6 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)
void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
{
int old_cpu = task_cpu(p);
- struct rq *old_rq = cpu_rq(old_cpu);
struct cfs_rq *old_cfsrq = task_cfs_rq(p),
*new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu);
@@ -2075,10 +2074,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
if (old_cpu != new_cpu) {
p->se.nr_migrations++;
-#ifdef CONFIG_SCHEDSTATS
- if (task_hot(p, old_rq->clock, NULL))
- schedstat_inc(p, se.nr_forced2_migrations);
-#endif
perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS,
1, 1, NULL, 0);
}
@@ -2521,7 +2516,6 @@ static void __sched_fork(struct task_struct *p)
p->se.nr_failed_migrations_running = 0;
p->se.nr_failed_migrations_hot = 0;
p->se.nr_forced_migrations = 0;
- p->se.nr_forced2_migrations = 0;
p->se.nr_wakeups = 0;
p->se.nr_wakeups_sync = 0;
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 0fc5287fe80f..5ae24fc65d75 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -432,7 +432,6 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
P(se.nr_failed_migrations_running);
P(se.nr_failed_migrations_hot);
P(se.nr_forced_migrations);
- P(se.nr_forced2_migrations);
P(se.nr_wakeups);
P(se.nr_wakeups_sync);
P(se.nr_wakeups_migrate);
@@ -508,7 +507,6 @@ void proc_sched_set_task(struct task_struct *p)
p->se.nr_failed_migrations_running = 0;
p->se.nr_failed_migrations_hot = 0;
p->se.nr_forced_migrations = 0;
- p->se.nr_forced2_migrations = 0;
p->se.nr_wakeups = 0;
p->se.nr_wakeups_sync = 0;
p->se.nr_wakeups_migrate = 0;
commit 9cf7826743e5c78dcfcfdc99d17f79ce6d3a2942
Merge: 3a0340be06a9 8638c4914f34
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 10 14:25:48 2009 +0100
Merge branch 'amd-iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
commit 7931241694b25589658b1ceb02218d2750540ae0
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 10 08:43:34 2009 +0100
perf kmem: Fix unused argument build warning
Fix:
builtin-kmem.c: In function 'parse_caller_opt':
builtin-kmem.c:690: error: unused parameter 'arg'
builtin-kmem.c: In function 'parse_alloc_opt':
builtin-kmem.c:697: error: unused parameter 'arg'
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <4B20A195.8030106@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 1b04787ed90a..5f209514f657 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -687,14 +687,14 @@ static int parse_sort_opt(const struct option *opt __used,
}
static int parse_caller_opt(const struct option *opt __used,
- const char *arg, int unset __used)
+ const char *arg __used, int unset __used)
{
caller_flag = (alloc_flag + 1);
return 0;
}
static int parse_alloc_opt(const struct option *opt __used,
- const char *arg, int unset __used)
+ const char *arg __used, int unset __used)
{
alloc_flag = (caller_flag + 1);
return 0;
commit 788d70dce0184eccc249ac6f05aa38b385b7497c
Merge: 2b876f95d03e f2942487ffb0
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 10 08:18:41 2009 +0100
Merge branch 'tip/tracing/core3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
commit 4c68db38c85188824b21698842b42a62b4f78657
Merge: 5c0e9f28da84 2b876f95d03e
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Dec 9 08:24:25 2009 +0100
Merge branch 'linus' into x86/urgent
Merge reason: We want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit f3d607c6b39bd9cb5000e03e2c0dc2afe1241374
Merge: 8055039c2a24 6ec22f9b037f
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Dec 7 13:14:12 2009 +0100
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 11a80ddbf3521c428bcde2d31e6632cef186bae9
Merge: 3a9a0beba291 56053170ea2a
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Dec 7 08:03:35 2009 +0100
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
commit d103d01e4b19f185d3c85f77402b605534c32e89
Merge: 26fb20d008d8 6f5f67267dc4
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 3 20:11:37 2009 +0100
Merge branch 'perf/probes' into perf/core
Merge reason: add these fixes to 'perf probe'.
Signed-off-by: Ingo Molnar <mingo@elte.hu>