[meta-lsi] [PATCH 82/86] linux-yocto: Correct the function call for irq_set_affinity_locked

Daniel Dragomir daniel.dragomir at windriver.com
Wed Oct 29 08:36:30 PDT 2014


For linux-yocto 3.10 from YOCTO (axxia) repo there is a wrong function call.
irq_set_affinity_locked function is declared with 3 arguments, including
'boolean force' and call without it, just with 2 parameters.
Patch kernel sources to call the function with 'force' parameter.

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 recipes-kernel/linux/linux-yocto-rt_3.10.bbappend           |  3 ++-
 recipes-kernel/linux/linux-yocto_3.10.bbappend              |  3 ++-
 ...parameter-on-call-function-irq_set_affinity_locked.patch | 13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 recipes-kernel/linux/patch/Add-third-parameter-on-call-function-irq_set_affinity_locked.patch

diff --git a/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index 7acc6bc..761720c 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:${THISDIR}/patch:"
 
 LSI_KERNEL_TAG = "8.8.1.30"
 LINUX_KERNEL_TYPE = "preempt-rt"
@@ -12,3 +12,4 @@ SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
 SRC_URI += "file://defconfig"
 SRC_URI += "file://fit"
+SRC_URI += "${@base_conditional('LSI_SRC', 'linux-yocto', 'file://Add-third-parameter-on-call-function-irq_set_affinity_locked.patch', '', d)}"
diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 2d65e7e..1c93cbb 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:${THISDIR}/patch:"
 
 LSI_KERNEL_TAG = "8.8.1.30"
 LINUX_KERNEL_TYPE = "standard"
@@ -12,3 +12,4 @@ SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
 SRC_URI += "file://defconfig"
 SRC_URI += "file://fit"
+SRC_URI += "${@base_conditional('LSI_SRC', 'linux-yocto', 'file://Add-third-parameter-on-call-function-irq_set_affinity_locked.patch', '', d)}"
diff --git a/recipes-kernel/linux/patch/Add-third-parameter-on-call-function-irq_set_affinity_locked.patch b/recipes-kernel/linux/patch/Add-third-parameter-on-call-function-irq_set_affinity_locked.patch
new file mode 100644
index 0000000..be13791
--- /dev/null
+++ b/recipes-kernel/linux/patch/Add-third-parameter-on-call-function-irq_set_affinity_locked.patch
@@ -0,0 +1,13 @@
+Index: linux/kernel/irq/manage.c
+===================================================================
+--- linux.orig/kernel/irq/manage.c
++++ linux/kernel/irq/manage.c
+@@ -198,7 +198,7 @@ int __irq_set_affinity(unsigned int irq,
+ 	if (!desc)
+ 		return -EINVAL;
+ 
+-	ret =  irq_set_affinity_locked(irq_desc_get_irq_data(desc), mask);
++	ret =  irq_set_affinity_locked(irq_desc_get_irq_data(desc), mask, force);
+ 	irq_put_desc_busunlock(desc, flags);
+ 	return ret;
+ }
-- 
1.8.1.4



More information about the meta-lsi mailing list