Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71d218b7 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] genirq: cleanup: include/linux/irq.h 



Small cleanups in include/linux/irq.h.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 34ffdb72

include/linux/irq.h

+28 −28
Original line number Original line Diff line number Diff line
@@ -74,14 +74,14 @@ struct irq_desc { 
	struct irqaction	*action;	/* IRQ action list */

	struct irqaction	*action;	/* IRQ action list */

	unsigned int		status;		/* IRQ status */

	unsigned int		status;		/* IRQ status */

	unsigned int		depth;		/* nested irq disables */

	unsigned int		depth;		/* nested irq disables */

	unsigned int irq_count;		/* For detecting broken interrupts */

	unsigned int		irq_count;	/* For detecting broken IRQs */

	unsigned int		irqs_unhandled;

	unsigned int		irqs_unhandled;

	spinlock_t		lock;

	spinlock_t		lock;

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	cpumask_t		affinity;

	cpumask_t		affinity;

#endif

#endif

#if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE)

#if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE)

	unsigned int move_irq;		/* Flag need to re-target intr dest*/

	unsigned int		move_irq;	/* need to re-target IRQ dest */

#endif

#endif

} ____cacheline_aligned;

} ____cacheline_aligned;
@@ -186,6 +186,15 @@ static inline void set_balance_irq_affinity(unsigned int irq, cpumask_t mask) 
}

}

#endif

#endif





#ifdef CONFIG_AUTO_IRQ_AFFINITY

extern int select_smp_affinity(unsigned int irq);

#else

static inline int select_smp_affinity(unsigned int irq)

{

	return 1;

}

#endif



extern int no_irq_affinity;

extern int no_irq_affinity;

extern int noirqdebug_setup(char *str);

extern int noirqdebug_setup(char *str);
@@ -202,15 +211,6 @@ extern int can_request_irq(unsigned int irq, unsigned long irqflags); 




extern void init_irq_proc(void);

extern void init_irq_proc(void);





#ifdef CONFIG_AUTO_IRQ_AFFINITY

extern int select_smp_affinity(unsigned int irq);

#else

static inline int select_smp_affinity(unsigned int irq)

{

	return 1;

}

#endif



#endif /* CONFIG_GENERIC_HARDIRQS */

#endif /* CONFIG_GENERIC_HARDIRQS */





extern hw_irq_controller no_irq_type;  /* needed in every arch ? */

extern hw_irq_controller no_irq_type;  /* needed in every arch ? */