Patches contributed by Eötvös Lorand University
commit c8710ad38900153af7a3e6762e99c062cfa46443
Merge: 6016ee13db51 86397dc3ccfc
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Aug 19 12:48:09 2010 +0200
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
commit f2036884400a1d867eae992681ecfd3e6725ece8
Merge: 351af0725e52 ecafda60e880
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Aug 19 12:25:29 2010 +0200
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
commit 9d5f3714e4705a66b6be693f7202192f756f498e
Merge: 625fdcaa6d2a 033a273f9836
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Aug 18 09:53:36 2010 +0200
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
commit f24645a991e6758a4544ed7667cf919fea328a95
Merge: d244b6bd41e0 e91846213241
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Aug 16 19:26:10 2010 +0200
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
commit 88d89da64951377962334b684634cfc1468aa93f
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Aug 12 21:50:00 2010 +0200
perf: Add back list_head data types
This commit:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Moved the list head data types out of list.h, breaking the build.
Add them to the perf types.h as well.
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/tools/perf/util/include/linux/types.h b/tools/perf/util/include/linux/types.h
index 196862a81a21..12de3b8112f9 100644
--- a/tools/perf/util/include/linux/types.h
+++ b/tools/perf/util/include/linux/types.h
@@ -6,4 +6,16 @@
#define DECLARE_BITMAP(name,bits) \
unsigned long name[BITS_TO_LONGS(bits)]
+struct list_head {
+ struct list_head *next, *prev;
+};
+
+struct hlist_head {
+ struct hlist_node *first;
+};
+
+struct hlist_node {
+ struct hlist_node *next, **pprev;
+};
+
#endif
commit f46a6804135795f77d096ab0128f27531c7d051c
Merge: b3e84ffa21f9 ad41a1e0cab0
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Aug 12 21:38:56 2010 +0200
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit b3e84ffa21f916e3354a12a7f19169c9febe96d0
Merge: 1c250d709fdc 4694153c252a
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Aug 11 09:39:10 2010 +0200
Merge branch 'perf/core' into perf/urgent
commit e66b688c6456e6a607a1636e228fe0395d6c7214
Merge: a7c55cbee0c1 71e7cf3a37ba
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Aug 6 09:00:32 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 0bcfe75807944106a3aa655a54bb610d62f3a7f5
Merge: eebef74695e1 396e894d289d
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Aug 5 09:46:29 2010 +0200
Merge branch 'sched/urgent' into sched/core
Conflicts:
include/linux/sched.h
Merge reason: Add the leftover .35 urgent bits, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc include/linux/sched.h
index 9a7bc5ba7e7e,6e0bb86de990..2091ea2a2c5c
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -271,16 -271,13 +271,10 @@@ extern int runqueue_is_locked(int cpu)
extern cpumask_var_t nohz_cpu_mask;
#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
-extern int select_nohz_load_balancer(int cpu);
-extern int get_nohz_load_balancer(void);
+extern void select_nohz_load_balancer(int stop_tick);
+extern int get_nohz_timer_target(void);
- extern int nohz_ratelimit(int cpu);
#else
-static inline int select_nohz_load_balancer(int cpu)
-{
- return 0;
-}
+static inline void select_nohz_load_balancer(int stop_tick) { }
-
- static inline int nohz_ratelimit(int cpu)
- {
- return 0;
- }
#endif
/*
commit fc9ea5a1e53ee54f681e226d735008e2a6f8f470
Merge: 61be7fdec2f5 9da79ab83ee3
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Aug 5 08:46:15 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core