Patches contributed by Eötvös Lorand University
commit 7c224a03a79021ab12ce057964df9e679af5386d
Merge: 5bdb7934ca41 b57f95a38233
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon May 10 13:12:26 2010 +0200
Merge commit 'v2.6.34-rc7' into oprofile
Merge reason: Update to Linus's latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 1f0ac7183f4d270bd9ce511254ba5d931d4f29c9
Merge: 232a5c948da5 76ba7e846fcc
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon May 10 08:20:19 2010 +0200
Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
diff --cc tools/perf/util/session.c
index 71bc608e0ec6,00ab298bbb4b..c088d8f9b51c
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@@ -98,9 -98,7 +98,8 @@@ struct perf_session *perf_session__new(
self->unknown_events = 0;
self->machines = RB_ROOT;
self->repipe = repipe;
- self->ordered_samples.flush_limit = ULLONG_MAX;
INIT_LIST_HEAD(&self->ordered_samples.samples_head);
+ machine__init(&self->host_machine, "", HOST_KERNEL_ID);
if (mode == O_RDONLY) {
if (perf_session__open(self, force) < 0)
commit e7858f52a5cb868289a72264534a1f05f3340c6c
Merge: 27a9da6538ee bbf1bb3eee86
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat May 8 18:11:19 2010 +0200
Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into sched/core
commit ed82702155b6343727ee732f7eae6d72e8b453fe
Merge: 4d1c52b02d97 1cf4a0632c24
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat May 8 10:02:57 2010 +0200
Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit cce913178118b0b36742eb7544c2b38a0c957ee7
Merge: d9f599e1e6d0 4fd38e4595e2
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri May 7 11:30:29 2010 +0200
Merge branch 'perf/urgent' into perf/core
Merge reason: Resolve patch dependency
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 48652ced1533c3372f996a0d83b6e73b1f1c9381
Merge: 99bd5e2f245d 66f41d4c5c8a
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri May 7 11:27:54 2010 +0200
Merge commit 'v2.6.34-rc6' into sched/core
commit c4f3b5a2d70eae4abb8bcaaf8dc3f067ff1714e8
Merge: 777d0411cd1e 02bf60aad7d5
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue May 4 18:31:47 2010 +0200
Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 56f0e74c9cf98941af700b61466648a2d06277bb
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon May 3 09:19:43 2010 +0200
x86: Fix parse_reservetop() build failure on certain configs
Commit e67a807 ("x86: Fix 'reservetop=' functionality") added a
fixup_early_ioremap() call to parse_reservetop() and declared it
in io.h.
But asm/io.h was only included indirectly - and on some configs
not at all, causing a build failure on those configs.
Cc: Liang Li <liang.li@windriver.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Wang Chen <wangchen@cn.fujitsu.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1272621711-8683-1-git-send-email-liang.li@windriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
index 26eadaa60e6c..792854003ed3 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -18,6 +18,7 @@
#include <asm/e820.h>
#include <asm/tlb.h>
#include <asm/tlbflush.h>
+#include <asm/io.h>
unsigned int __VMALLOC_RESERVE = 128 << 20;
commit 0e417fe1f247bb3ac056ee04604332005c334fac
Merge: 53ba4f2fa732 913769f24ead
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon May 3 09:17:46 2010 +0200
Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into core/locking
commit 53ba4f2fa73225113a488584df0d85d3cba52943
Merge: bd6d29c25bb1 66f41d4c5c8a
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon May 3 09:17:01 2010 +0200
Merge commit 'v2.6.34-rc6' into core/locking