[meta-freescale] [PATCH] linux-qoriq-sdk: Repair a kernel compile issue due to a sintax error.

zhenhua.luo at freescale.com zhenhua.luo at freescale.com
Tue Feb 18 01:39:56 PST 2014


Hi Alex, 

> -----Original Message-----
> From: meta-freescale-bounces at yoctoproject.org [mailto:meta-freescale-
> bounces at yoctoproject.org] On Behalf Of Alexandru.Vaduva
> Sent: Monday, February 10, 2014 11:36 PM
> 
> From: "Alexandru.Vaduva" <Alexandru.Vaduva at enea.com>
> 
> The define __hard_irq_disable() was done using ";" character into the
> comment so the if structure did not recognized the "else" branch.
> 
> Upstream-Status: Pending
> 
> Signed-off-by: Alexandru Vaduva <alexandru.vaduva at enea.com>
> Signed-off-by: Alexandru.Vaduva <Alexandru.Vaduva at enea.com>
> ---
>  .../linux/files/b4860-hard_irq_disable-bug.patch   |   24
> ++++++++++++++++++++
>  recipes-kernel/linux/linux-qoriq-sdk.bb            |    3 +++
>  2 files changed, 27 insertions(+)
>  create mode 100644 recipes-kernel/linux/files/b4860-hard_irq_disable-
> bug.patch
> 
> diff --git a/recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch
> b/recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch
> new file mode 100644
> index 0000000..b8ef705
> --- /dev/null
> +++ b/recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch
> @@ -0,0 +1,24 @@
> +linux-qoriq-sdk: Repair a kernel compile issue due to a sintax error.
> +
> +The define __hard_irq_disable() was done using ";" character into the
> +comment so the if structure did not recognized the "else" branch.
> +
> +Upstream-Status: Pending
[Luo Zhenhua-B19537] Why is the status pending? The kernel fix patch should be submitted to upstream. The appropriate fix should be removing the trailing semicolon from the __hard_irq_disable() macro definition. 


Best Regards,

Zhenhua

> +Signed-off-by: Alexandru Vaduva <alexandru.vaduva at enea.com>
> +
> +diff -ruN a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
> +--- a/arch/powerpc/kernel/irq.c	2014-01-30 12:56:20.470918180 +0100
> ++++ b/arch/powerpc/kernel/irq.c	2014-01-30 12:57:25.228109187 +0100
> +@@ -227,8 +227,9 @@
> + 	 * common cases that we'll ignore for now), so we skip the
> + 	 * (expensive) mtmsrd.
> + 	 */
> +-	if (unlikely(irq_happened != PACA_IRQ_HARD_DIS))
> ++	if (unlikely(irq_happened != PACA_IRQ_HARD_DIS)) {
> + 		__hard_irq_disable();
> ++	}
> + #ifdef CONFIG_TRACE_IRQFLAGS
> + 	else {
> + 		/*
> diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-
> kernel/linux/linux-qoriq-sdk.bb
> index 0ff68ce..a7dd821 100644
> --- a/recipes-kernel/linux/linux-qoriq-sdk.bb
> +++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
> @@ -7,6 +7,9 @@ LICENSE = "GPLv2"
> 
>  require recipes-kernel/linux/linux-qoriq-sdk.inc
> 
> +SRC_URI += "file://b4860-hard_irq_disable-bug.patch"
> +
> +
>  PR = "${INC_PR}.1"
> 
>  DEPENDS_append = " libgcc"
> --
> 1.7.10.4
> 
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
> 



More information about the meta-freescale mailing list