Patches contributed by Eötvös Lorand University
commit b7c924274c456499264d1cfa3d44063bb11eb5db
Merge: 1018faa6cf23 bc76efe64533
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 5 09:05:44 2012 +0100
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Cherry picked fixes from perf/core, together with the kernel fix (1018faa),
the sampling tools (top, record) are back working on AMD systems.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 5d85d97c9f6973ba854f35a2d5e80fe68272143e
Merge: 30ce2f7eef09 1c1bc9223387
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Mar 2 08:40:45 2012 +0100
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Various smaller perf/urgent fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 7e4d960993331e92567f0180e45322a93e6780ba
Merge: de5bdff7a72a 164974a8f2a4
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Mar 1 10:26:41 2012 +0100
Merge branch 'linus' into sched/core
Merge reason: we'll queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5
Merge: 83b8450317a1 c5905afb0ee6
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Feb 28 19:59:45 2012 +0100
Merge branch 'perf/jump-labels' into perf/core
Merge reason: After much naming discussion, there seems to be consensus
now - queue it up for v3.4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 8bd69c2d5f9c0b5237c632d1b21dbfe4fd16ba6b
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Feb 28 10:35:06 2012 +0100
x86/x32: Fix the binutils auto-detect
Fix:
arch/x86/Makefile:96: *** recipe commences before first target. Stop.
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: H. J. Lu <hjl.tools@gmail.com>
Link: http://lkml.kernel.org/r/1329696488-16970-1-git-send-email-hpa@zytor.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 31bb1eb1216a..968dbe24a255 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -88,13 +88,13 @@ ifdef CONFIG_X86_X32
$(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" - && \
$(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \
$(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n)
- ifeq ($(x32_ld_ok),y)
- CONFIG_X86_X32_ABI := y
- KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
- KBUILD_CFLAGS += -DCONFIG_X86_X32_ABI
- else
- $(warning CONFIG_X86_X32 enabled but no binutils support)
- endif
+ ifeq ($(x32_ld_ok),y)
+ CONFIG_X86_X32_ABI := y
+ KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
+ KBUILD_CFLAGS += -DCONFIG_X86_X32_ABI
+ else
+ $(warning CONFIG_X86_X32 enabled but no binutils support)
+ endif
endif
export CONFIG_X86_X32_ABI
commit e24b90b282d73c0654c716d449d91a07ebb8ecaf
Merge: 458ce2910aa8 79fb4ad63e82
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Feb 28 10:28:24 2012 +0100
Merge branch 'tip/x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into x86/asm
commit 458ce2910aa83d8a2cafb489d727f7da839e73c6
Merge: 69466466ce88 586c6e7013c8
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Feb 28 10:26:07 2012 +0100
Merge branch 'linus' into x86/asm
Sync up the latest NMI fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit bdd4431c8d071491a68a65d9457996f222b5ecd3
Merge: 586c6e7013c8 1cc85961e214
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Feb 28 10:16:01 2012 +0100
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
The major features of this series are:
- making RCU more aggressive about entering dyntick-idle mode in order to
improve energy efficiency
- converting a few more call_rcu()s to kfree_rcu()s
- applying a number of rcutree fixes and cleanups to rcutiny
- removing CONFIG_SMP #ifdefs from treercu
- allowing RCU CPU stall times to be set via sysfs
- adding CPU-stall capability to rcutorture
- adding more RCU-abuse diagnostics
- updating documentation
- fixing yet more issues located by the still-ongoing top-to-bottom
inspection of RCU, this time with a special focus on the
CPU-hotplug code path.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 83b8450317a1441aef5d110cbc4102d53df9ec02
Merge: 4ff16c25e2cc 5500fa51199a
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Feb 27 08:44:48 2012 +0100
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
commit 11b91d6fe7272452c999573bab33c15c2f03dc31
Merge: 4e9f44ba29f2 08dda402d60a
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Feb 24 16:26:39 2012 +0100
Merge tag 'mce-recovery-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
Add symbolic defines for architectural MCACOD constants