[meta-lsi] [PATCH 02/15] Revert "linux-yocto: Correct the function call for irq_set_affinity_locked"

[Cristian Bercaru]

From: Daniel Dragomir <daniel.dragomir at windriver.com>

This issue was solved in kernel sources. Not need this patch anymore.

This reverts commit acdf7e2a332f0960c2548e3f9395edcc26651801.
---
 recipes-kernel/linux/linux-yocto-rt_3.10.bbappend  |    3 +--
 recipes-kernel/linux/linux-yocto_3.10.bbappend     |    3 +--
 ...-on-call-function-irq_set_affinity_locked.patch |   13 -------------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete 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 3435337..647740d 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}:${THISDIR}/patch:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 LSI_SRC ?= "linux-yocto"
@@ -10,4 +10,3 @@ 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 255f922..0e6e2cc 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}:${THISDIR}/patch:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:"
 
 LINUX_KERNEL_TYPE = "standard"
 LSI_SRC ?= "linux-yocto"
@@ -10,4 +10,3 @@ 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
deleted file mode 100644
index be13791..0000000
--- a/recipes-kernel/linux/patch/Add-third-parameter-on-call-function-irq_set_affinity_locked.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.7.9.5