Patches contributed by Eötvös Lorand University

commit 167e33c32845a30368463dac5a4fe2be5edcc34a
Merge: 86b47c25494b 6340cfed48c4
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Dec 7 23:23:44 2011 +0100

    Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent

commit cc991b83b3eb11b253dd932932fa0bfd09c7564a
Merge: b202952075f6 39eaf7ef884d
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Dec 6 19:09:15 2011 +0100

    Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

commit 7119a341f35b0a3ddcf426818267980057c770a1
Merge: 87cdee71166f 5611cc4572e8
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Dec 6 08:11:27 2011 +0100

    Merge commit 'v3.2-rc4' into core/locking
    
    Merge reason: Pick up post-rc1 fixes.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit d6c1c49de577fa292af2449817364b7d89b574d8
Merge: 9dde9dc0a81c ddf6e0e50723
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Dec 6 06:42:35 2011 +0100

    Merge branch 'perf/urgent' into perf/core
    
    Merge reason: Add these cherry-picked commits so that future changes
                  on perf/core don't conflict.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit f1b23714cb578c88ea051768bf26b459e1264411
Merge: 1ef038909699 ce37defc0f66
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Dec 5 16:38:51 2011 +0100

    Merge branch 'ucode' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent

commit dc440d10e1668b15fe704a23adb9b53fbbb24a44
Merge: 2c3757e54e0d d3d9acf64667
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Dec 5 14:34:00 2011 +0100

    Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

commit 53b5650273fea486ac8ac6c1d1e9a6cd17aa31ca
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Dec 5 12:25:44 2011 +0100

    x86: Fix the 32-bit stackoverflow-debug build
    
    The panic_on_stackoverflow variable needs to be avilable
    on the 32-bit side as well ...
    
    Cc: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
    Cc: Randy Dunlap <rdunlap@xenotime.net>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Link: http://lkml.kernel.org/r/20111129060836.11076.12323.stgit@ltc219.sdl.hitachi.co.jp
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index e16e99ebd7ad..40fc86161d92 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -28,6 +28,9 @@ DEFINE_PER_CPU(struct pt_regs *, irq_regs);
 EXPORT_PER_CPU_SYMBOL(irq_regs);
 
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
+
+int sysctl_panic_on_stackoverflow __read_mostly;
+
 /* Debugging check for stack overflow: is there less than 1KB free? */
 static int check_stack_overflow(void)
 {

commit 01acc269083015e2f78407f59dc8d6378fce22ee
Merge: 8e8da023f5af 31a8394e069e
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Dec 5 10:55:23 2011 +0100

    Merge branch 'upstream/ticketlock-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/asm

commit 2c3757e54e0d95f47bdc160fdc4f14849f3437cf
Merge: 10c6db110d0e 47fbe53bef3b
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Dec 5 10:32:39 2011 +0100

    Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent

commit c23205c8488f11cb9ebe7a7b5851a1d8a0171011
Merge: 5d81e5cfb37a de346b694906
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Nov 15 11:05:18 2011 +0100

    Merge branch 'core' of git://amd64.org/linux/rric into perf/core