Patches contributed by Eötvös Lorand University
commit 915a0b575fdb2376135ed9334b3ccb1eb51db622
Merge: e02c4fd3142d 0e95017355dc
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Mar 11 13:39:33 2010 +0100
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
commit caa0142d84ceb0fc83e28f0475d0a7316cb6df77
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Jun 6 13:58:12 2009 +0200
perf, x86: Fix the !CONFIG_CPU_SUP_INTEL build
Fix typo. But the modularization here is ugly and should be improved.
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index 1bfd59beb658..c59678a14a2e 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -661,7 +661,7 @@ static void intel_ds_init(void)
#else /* CONFIG_CPU_SUP_INTEL */
-static int reseve_ds_buffers(void)
+static int reserve_ds_buffers(void)
{
return 0;
}
commit ba7e4d13fc7e25af1d167d40e6f028298dfc55ad
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Jun 6 13:58:12 2009 +0200
perf, x86: Add INSTRUCTION_DECODER config flag
The PEBS+LBR decoding magic needs the insn_get_length() infrastructure
to be able to decode x86 instruction length.
So split it out of KPROBES dependency and make it enabled when either
KPROBES or PERF_EVENTS is enabled.
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e98440371525..e1240f652a9b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -58,6 +58,9 @@ config X86
select HAVE_ARCH_KMEMCHECK
select HAVE_USER_RETURN_NOTIFIER
+config INSTRUCTION_DECODER
+ def_bool (KPROBES || PERF_EVENTS)
+
config OUTPUT_FORMAT
string
default "elf32-i386" if X86_32
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 419386c24b82..cbaf8f2b83df 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -20,7 +20,7 @@ lib-y := delay.o
lib-y += thunk_$(BITS).o
lib-y += usercopy_$(BITS).o getuser.o putuser.o
lib-y += memcpy_$(BITS).o
-lib-$(CONFIG_KPROBES) += insn.o inat.o
+lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o
obj-y += msr.o msr-reg.o msr-reg-export.o
commit 548b84166917d6f5e2296123b85ad24aecd3801d
Merge: cfb581bcd4f8 57d54889cd00
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 9 17:11:53 2010 +0100
Merge commit 'v2.6.34-rc1' into perf/urgent
Conflicts:
tools/perf/util/probe-event.c
Merge reason: Pick up -rc1 and resolve the conflict as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit cfb581bcd4f8c158c6f2b48bf5e232bb9e6855c0
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 8 15:20:50 2010 +0100
MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/MAINTAINERS b/MAINTAINERS
index 2533fc45a44a..40ed22e02d62 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4221,6 +4221,7 @@ PERFORMANCE EVENTS SUBSYSTEM
M: Peter Zijlstra <a.p.zijlstra@chello.nl>
M: Paul Mackerras <paulus@samba.org>
M: Ingo Molnar <mingo@elte.hu>
+M: Arnaldo Carvalho de Melo <acme@redhat.com>
S: Supported
F: kernel/perf_event.c
F: include/linux/perf_event.h
commit 3e75c3b0ca669ce675c52ad36a7998f55f16757f
Merge: cf4fee502823 29044ad1509e
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Mar 4 12:27:39 2010 +0100
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
commit e02c4fd3142dfb9412531bbfabd510a2a7c6ea46
Merge: ae1f30384bae ac91d8545637
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Mar 4 11:51:29 2010 +0100
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
commit 4f16d4e0c9a4b20d9f0db365587b96d6001efd7d
Merge: 1e259e0a9982 6630125419ef
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Mar 4 11:47:50 2010 +0100
Merge branch 'perf/core' into perf/urgent
Merge reason: Switch from pre-merge topical split to the post-merge urgent track
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 0e064caf6402d1d67db4233d26beec88ca212919
Merge: 90a6501f94ae f409adf5b1db c13f3d378f77
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Mar 4 11:45:25 2010 +0100
Merge branches 'core/futexes' and 'core/iommu' into core/urgent
Merge reason: Switch from topical split to the stabilization track
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 51c1410bd651609aafbcc3a2294df26a47bf6137
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 2 09:53:45 2010 -0500
compal-laptop: Make it depend on CONFIG_RFKILL
-tip testing found this build failure (x86 randconfig):
drivers/built-in.o: In function `setup_rfkill':
compal-laptop.c:(.text+0x36abe8): undefined reference to `rfkill_alloc'
compal-laptop.c:(.text+0x36abfc): undefined reference to `rfkill_register'
compal-laptop.c:(.text+0x36ac30): undefined reference to `rfkill_alloc'
compal-laptop.c:(.text+0x36ac44): undefined reference to `rfkill_register'
Which can happen with CONFIG_COMPAL_LAPTOP=y but COMPAL_LAPTOP=m.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 92161c7ff4b7..cd2ee6fce1b4 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -179,6 +179,7 @@ config COMPAL_LAPTOP
tristate "Compal Laptop Extras"
depends on ACPI
depends on BACKLIGHT_CLASS_DEVICE
+ depends on RFKILL
---help---
This is a driver for laptops built by Compal: