Re: 2.6.17-mm3: arm: *_irq_wake compile error

[Thomas Gleixner]

On Wed, 2006-06-28 at 00:40 +0200, Adrian Bunk wrote:
> genirq-add-irq-wake-power-management-support.patch causes the following 
> compile error on arm:
> 
> <--  snip  -->
> 
> ...
>   CC      init/main.o
> In file included from include/linux/rtc.h:102,
>                  from include/linux/efi.h:19,
>                  from init/main.c:47:
> include/linux/interrupt.h:108: error: conflicting types for 'enable_irq_wake'
> include/asm/irq.h:47: error: previous declaration of 'enable_irq_wake' was here
> include/linux/interrupt.h:113: error: conflicting types for 'disable_irq_wake'
> include/asm/irq.h:46: error: previous declaration of 'disable_irq_wake' was here
> make[1]: *** [init/main.o] Error 1

Thats a mismerge with LOCKDEP

This section was originally inside #ifdef CONFIG_GENERIC_HARDIRQS

/* IRQ wakeup (PM) control: */
extern int set_irq_wake(unsigned int irq, unsigned int on);

static inline int enable_irq_wake(unsigned int irq)
{
        return set_irq_wake(irq, 1);
}

static inline int disable_irq_wake(unsigned int irq)
{
        return set_irq_wake(irq, 0);
}

The patch is:

lockdep-add-disable-enable_irq_lockdep-api.patch

	tglx


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/