linux-yocto/3.4: make uprobes select perf events

uprobes depends on functionality provided by perf events. After
uprobes was enabled in the standard kernel the mpc8315 board showed
link errors due to missing perf event functions.

This problem isn't isolated to the board or powerpc arch, but all
other boards have PERF_EVENTS enabled. To fix this, we make UPROBE_EVENT
select PERF_EVENTS, and any new boards will be protected from the
same failure.

We also update the configuration fragments since CONFIG_UPROBES depends on
CONFIG_PERF_EVENTS being set, so PERF_EVENTS needs to be added whenever
uprobes are enabled.

[YOCTO #3111]

(From OE-Core rev: b681b74624d1c8c4c98b2a121828e010fc5c3a25)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 3b6b4e7..e42216b 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -8,9 +8,9 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "a35693b1287c0e50cdca33a1b95af0ff48b43cd0"
-SRCREV_machine_qemuppc ?= "85a1190530cb5749f5f831670976b163438dc301"
-SRCREV_meta ?= "79947f1eb9f695c374ba63672f94deaa1de75561"
+SRCREV_machine ?= "dcecefa43e05f5450886648a93e2fda2ec35e2dc"
+SRCREV_machine_qemuppc ?= "5e8709c4777f07a12b0a05a22f0864f552ef9449"
+SRCREV_meta ?= "7c50e572635d356f0b66d9ab90823f127f835744"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 0812cff..7c082e7 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "b15e7b1e9b58b9863bd87778775f86cd8d8880ea"
-SRCREV_machine_qemumips  ?= "8d5b98f263b5119af2dc30223f311be17173bab9"
-SRCREV_machine_qemuppc ?= "b9a720ca38d298ed457f37d099c85771f9164b19"
-SRCREV_machine_qemux86 ?= "46d8c757b3be1953f30d6745505d24436e2d6844"
-SRCREV_machine_qemux86-64 ?= "46d8c757b3be1953f30d6745505d24436e2d6844"
-SRCREV_machine ?= "46d8c757b3be1953f30d6745505d24436e2d6844"
-SRCREV_meta ?= "79947f1eb9f695c374ba63672f94deaa1de75561"
+SRCREV_machine_qemuarm ?= "679978b4fd1ef8cfea97d4ee4b4cd7c51bc62ee2"
+SRCREV_machine_qemumips  ?= "9c7810609ff37a77e8d39680f98f1baefee18a80"
+SRCREV_machine_qemuppc ?= "cf4bad14983753ad4b592c40fb36466b202b24a4"
+SRCREV_machine_qemux86 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff"
+SRCREV_machine_qemux86-64 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff"
+SRCREV_machine ?= "59c3ff750831338d05ab67d5efd7fc101c451aff"
+SRCREV_meta ?= "7c50e572635d356f0b66d9ab90823f127f835744"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"