Patches contributed by Eötvös Lorand University
commit 61be7fdec2f51b99570cd5dcc30c7848c8e56513
Merge: 12a81c8df13c eb703f98191a
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Aug 5 08:45:05 2010 +0200
Merge branch 'perf/nmi' into perf/core
Conflicts:
kernel/Makefile
Merge reason: Add the now complete topic, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/Kconfig
index dcb0593b4a66,3cb5bb02172b..6f77afa6bca9
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -53,8 -53,8 +53,9 @@@ config X8
select HAVE_KERNEL_LZMA
select HAVE_KERNEL_LZO
select HAVE_HW_BREAKPOINT
+ select HAVE_MIXED_BREAKPOINTS_REGS
select PERF_EVENTS
+ select HAVE_PERF_EVENTS_NMI
select ANON_INODES
select HAVE_ARCH_KMEMCHECK
select HAVE_USER_RETURN_NOTIFIER
diff --cc kernel/Makefile
index 057472fbc272,6adeafc3e259..ce53fb2bd1d9
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@@ -75,9 -75,9 +75,9 @@@ obj-$(CONFIG_AUDITSYSCALL) += auditsc.
obj-$(CONFIG_GCOV_KERNEL) += gcov/
obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
obj-$(CONFIG_KPROBES) += kprobes.o
-obj-$(CONFIG_KGDB) += kgdb.o
+obj-$(CONFIG_KGDB) += debug/
- obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o
obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o
+ obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o
obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
obj-$(CONFIG_SECCOMP) += seccomp.o
obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
commit 12a81c8df13c60904febcafcf6b90ca1acb67122
Merge: 43d7383bbec1 729419f00906
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Aug 4 16:25:47 2010 +0200
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
commit 43d7383bbec1878f838060d6bbd214f6d0485478
Merge: 69e77a8b0426 0a1eae391d0d
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Aug 3 07:45:00 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01
Merge: 9fc3af467d07 9fe6206f4006
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Aug 2 08:29:56 2010 +0200
Merge commit 'v2.6.35' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c
Merge reason: Resolve the conflicts and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc tools/perf/util/symbol.c
index 94cdf68440cd,5b276833e2bf..3b8c00506672
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@@ -1569,10 -1489,11 +1571,12 @@@ static int map_groups__set_modules_path
dir_name, dent->d_name);
long_name = strdup(path);
- if (long_name == NULL)
- goto failure;
+ if (long_name == NULL) {
+ ret = -1;
+ goto out;
+ }
dso__set_long_name(map->dso, long_name);
+ map->dso->lname_alloc = 1;
dso__kernel_module_get_build_id(map->dso, "");
}
}
commit 9fc3af467d0749989518a23f7289a6f44e5cb214
Merge: d65a458b348c cc05152ab72d
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Aug 2 08:28:08 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
commit 3a01736e70a7d629140695ba46a901266b4460cc
Merge: 4c21adf26f8f 24a461d537f4
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 23 09:10:29 2010 +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 dca45ad8af54963c005393a484ad117b8ba6150f
Merge: 68c38fc3cb4e cd5b8f8755a8
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jul 21 21:45:02 2010 +0200
Merge branch 'linus' into sched/core
Merge reason: Move from the -rc3 to the almost-rc6 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 23c2875725ebb03e58e598754309e198648f608a
Merge: 9dcdbf7a33d9 b444786f1a79
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jul 21 21:44:18 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
commit 9dcdbf7a33d9018ac5d45debcf261be648bdd56a
Merge: cc5edb0eb9ce cd5b8f8755a8
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jul 21 21:43:03 2010 +0200
Merge branch 'linus' into perf/core
Merge reason: Pick up the latest perf fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc tools/perf/util/callchain.h
index 809850fb75fb,f2e9ee164bd8..624a96c636fd
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@@ -58,7 -61,7 +61,7 @@@ static inline u64 cumul_hits(struct cal
int register_callchain_param(struct callchain_param *param);
int append_chain(struct callchain_node *root, struct ip_callchain *chain,
- struct map_symbol *syms);
+ struct map_symbol *syms, u64 period);
-bool ip_callchain__valid(struct ip_callchain *chain, event_t *event);
+bool ip_callchain__valid(struct ip_callchain *chain, const event_t *event);
#endif /* __PERF_CALLCHAIN_H */
commit 31a05a4127c81d5d7f095c609420bf6df892a8b0
Merge: 821756335987 eb878b3bc034
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Jul 17 12:00:25 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core