Re: [patch 1/7] mips: sibyte: Add missing irq_mask function

[Ralf Baechle <ralf@xxxxxxxxxxxxxx>]

On Sat, Jul 23, 2011 at 12:41:22PM -0000, Thomas Gleixner wrote:

> Crashes on free_irq() otherwise.
> 
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> ---
>  arch/mips/sibyte/sb1250/irq.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6/arch/mips/sibyte/sb1250/irq.c
> ===================================================================
> --- linux-2.6.orig/arch/mips/sibyte/sb1250/irq.c
> +++ linux-2.6/arch/mips/sibyte/sb1250/irq.c
> @@ -178,7 +178,7 @@ static void ack_sb1250_irq(struct irq_da
>  
>  static struct irq_chip sb1250_irq_type = {
>  	.name = "SB1250-IMR",
> -	.irq_mask_ack = ack_sb1250_irq,
> +	.irq_mask = ack_sb1250_irq,

This conflicts with 1544129da2de9fa276429deed8fac3fbc45634be [MIPS: SB1250:
Restore dropped irq_mask function] which does:

@@ -180,6 +187,7 @@ static struct irq_chip sb1250_irq_type = {
        .name = "SB1250-IMR",
        .irq_mask_ack = ack_sb1250_irq,
        .irq_unmask = enable_sb1250_irq,
+       .irq_mask = disable_sb1250_irq,
 #ifdef CONFIG_SMP
        .irq_set_affinity = sb1250_set_affinity
 #endif

  Ralf