Patches contributed by Eötvös Lorand University
commit eb4316dd0a96a74104e5b921e640e73a99b56795
Merge: 13e5befaddcf 9df03abeda3d
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Mar 17 09:12:03 2011 +0100
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
commit 344c21c32287755b5cda0eeb84adb4546a57c1db
Merge: b87cf80af3ba 84fd1d35cc86
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 16 16:33:56 2011 +0100
Merge branch 'x86/amd-nb' into x86/urgent
Merge reason: This is one followup commit that was not in x86/mm - merge it via the urgent path
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 8b7cdd08fe304b41a2399eaaa5225159ac6db0d8
Merge: d10902812c9c 43adec955edd
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 16 13:42:48 2011 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
commit 5e814dd597c42daeb8d2a276e64a6ec986ad0e2a
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 15 20:51:09 2011 +0100
perf probe: Clean up probe_point_lazy_walker() return value
Newer compilers (gcc 4.6) complains about:
return ret < 0 ?: 0;
For the following reason:
util/probe-finder.c: In function ‘probe_point_lazy_walker’:
util/probe-finder.c:1331:18: error: the omitted middle operand in ?: will always be ‘true’, suggest explicit middle operand [-Werror=parentheses]
And indeed the return value is a somewhat obscure (but correct) value
of 'true', so return 'ret' instead - this is cleaner and unconfuses
GCC as well.
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 17f9c4a66ddd..194f9e2a3285 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1328,7 +1328,7 @@ static int probe_point_lazy_walker(const char *fname, int lineno,
* Continue if no error, because the lazy pattern will match
* to other lines
*/
- return ret < 0 ?: 0;
+ return ret < 0 ? ret : 0;
}
/* Find probe points from lazy pattern */
commit 8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2
Merge: 56396e6823fe 521cb40b0c44
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 15 08:29:44 2011 +0100
Merge commit 'v2.6.38' into x86/mm
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: Resolve the conflict, update the branch to .38.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/kernel/smpboot.c
index fe4837136e02,08776a953487..a9d805f3920c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -1074,8 -1137,10 +1074,8 @@@ void __init native_smp_prepare_cpus(uns
if (!skip_ioapic_setup && nr_ioapics)
enable_IO_APIC();
- end_local_APIC_setup();
+ bsp_end_local_APIC_setup();
- map_cpu_to_logical_apicid();
-
if (apic->setup_portio_remap)
apic->setup_portio_remap();
commit 137ee20ddd10fdc20600c389fe63edab0c39cb1a
Merge: 4a0b1665db09 1c0b04d10bbe
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Mar 11 09:28:31 2011 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit c8b44163b754612fc4769fe1c5df00e98fc9d3c6
Merge: ac23f25355ef a5abba989dec
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 9 10:38:55 2011 +0100
Merge commit 'v2.6.38-rc8' into x86/asm
Merge reason: Update with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 86cb2ec7b22a0a89b8660110dc03321fadbef45f
Merge: 7f0030b21157 a5abba989dec
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 8 17:21:49 2011 +0100
Merge commit 'v2.6.38-rc8' into perf/core
Merge reason: Merge latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit ca764aaf025d2c83054191895b366fa81a9ccf48
Merge: d04c579f971b 078a198906c7
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Mar 5 07:32:45 2011 +0100
Merge branch 'x86-mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into x86/mm
commit e0a92c17470775cd85bac52f5372ccc3dc58254a
Merge: 544b4a1f309d 0c3b9168017c
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Mar 4 11:12:24 2011 +0100
Merge branch 'sched/urgent' into sched/core
Merge reason: Add fixes before applying dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>