Patches contributed by Eötvös Lorand University
commit cc2221969906a166a638aecdbae84a3d0462719e
Merge: 56f4c4003491 387c31c7e5c9
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Jan 4 08:08:51 2011 +0100
Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc tools/perf/builtin-buildid-list.c
index 3b06f9ca2638,c49837de7d3f..5af32ae9031e
--- a/tools/perf/builtin-buildid-list.c
+++ b/tools/perf/builtin-buildid-list.c
@@@ -36,11 -36,9 +36,10 @@@ static const struct option options[] =
static int __cmd_buildid_list(void)
{
- int err = -1;
struct perf_session *session;
- session = perf_session__new(input_name, O_RDONLY, force, false);
+ session = perf_session__new(input_name, O_RDONLY, force, false,
+ &build_id__mark_dso_hit_ops);
if (session == NULL)
return -1;
diff --cc tools/perf/util/symbol.c
index 2ea1a2e4c0c2,439ab947daf4..15ccfba8cdf8
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@@ -1822,15 -1780,12 +1822,15 @@@ out_failure
return -1;
}
- static int dso__load_vmlinux(struct dso *self, struct map *map,
- const char *vmlinux, symbol_filter_t filter)
+ int dso__load_vmlinux(struct dso *self, struct map *map,
+ const char *vmlinux, symbol_filter_t filter)
{
int err = -1, fd;
+ char symfs_vmlinux[PATH_MAX];
- fd = open(vmlinux, O_RDONLY);
+ snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s/%s",
+ symbol_conf.symfs, vmlinux);
+ fd = open(symfs_vmlinux, O_RDONLY);
if (fd < 0)
return -1;
commit a0a2b71bb750ffe9b3faa317cb6317f4ad109383
Merge: c7c25802b39c d425de5436a6
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jan 3 19:59:24 2011 +0100
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
commit 56f4c400349157289b474a3fd49ee96acab0a4d7
Merge: 32ae2ade4621 da169f5df276
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 30 11:26:45 2010 +0100
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
commit 104db7ff1d9d01a03a2568a156b19e1fd972e8bf
Merge: 4a7863cc2eb5 32b2b6ec57a3
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 23 14:19:45 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 394f4528c523d88daabd50f883a8d6b164075555
Merge: 90a8a73c06cc 3c2dcf2aed5e
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 23 12:57:04 2010 +0100
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
commit 26e20a108caca6231c6a5ec659f815a866904751
Merge: 691513f70d39 90a8a73c06cc
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 23 09:48:41 2010 +0100
Merge commit 'v2.6.37-rc7' into x86/security
commit 9fb67204d7a00a6444bc121f221527034613d338
Merge: 8c1df4002aa4 287050d39026
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Dec 22 12:46:12 2010 +0100
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
commit 8c1df4002aa425973d7d25ffa56c042acd953bed
Merge: 6c529a266bdc 21dd9ae5a4e9
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Dec 22 11:54:50 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 6c529a266bdc590a870ee2d2092ff6527eff427b
Merge: 7639dae0ca11 90a8a73c06cc
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Dec 22 11:53:20 2010 +0100
Merge commit 'v2.6.37-rc7' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/kernel/apic/apic.c
index e9e2a93783f9,78218135b48e..fb7657822aad
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -1382,7 -1387,16 +1382,15 @@@ void __cpuinit end_local_APIC_setup(voi
}
#endif
- setup_apic_nmi_watchdog(NULL);
apic_pm_activate();
+
+ /*
+ * Now that local APIC setup is completed for BP, configure the fault
+ * handling for interrupt remapping.
+ */
+ if (!smp_processor_id() && intr_remapping_enabled)
+ enable_drhd_fault_handling();
+
}
#ifdef CONFIG_X86_X2APIC
commit 2ce494a3dac331fdbb2590e5fa0598956dd21b8b
Merge: 90a8a73c06cc 3b4694de3596
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Dec 22 11:31:03 2010 +0100
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent