[PATCH] CHECK_IRQ_PER_CPU() to avoid dead code in __do_IRQ()
IRQ_PER_CPU is not used by all architectures. This patch introduces the macros ARCH_HAS_IRQ_PER_CPU and CHECK_IRQ_PER_CPU() to avoid the generation of dead code in __do_IRQ(). ARCH_HAS_IRQ_PER_CPU is defined by architectures using IRQ_PER_CPU in their include/asm_ARCH/irq.h file. Through grepping the tree I found the following architectures currently use IRQ_PER_CPU: cris, ia64, ppc, ppc64 and parisc. Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
f8eeaaf418
commit
f26fdd5992
|
@ -1,6 +1,11 @@
|
|||
#ifndef _ASM_IRQ_H
|
||||
#define _ASM_IRQ_H
|
||||
|
||||
/*
|
||||
* IRQ line status macro IRQ_PER_CPU is used
|
||||
*/
|
||||
#define ARCH_HAS_IRQ_PER_CPU
|
||||
|
||||
#include <asm/arch/irq.h>
|
||||
|
||||
extern __inline__ int irq_canonicalize(int irq)
|
||||
|
|
|
@ -14,6 +14,11 @@
|
|||
#define NR_IRQS 256
|
||||
#define NR_IRQ_VECTORS NR_IRQS
|
||||
|
||||
/*
|
||||
* IRQ line status macro IRQ_PER_CPU is used
|
||||
*/
|
||||
#define ARCH_HAS_IRQ_PER_CPU
|
||||
|
||||
static __inline__ int
|
||||
irq_canonicalize (int irq)
|
||||
{
|
||||
|
|
|
@ -26,6 +26,11 @@
|
|||
|
||||
#define NR_IRQS (CPU_IRQ_MAX + 1)
|
||||
|
||||
/*
|
||||
* IRQ line status macro IRQ_PER_CPU is used
|
||||
*/
|
||||
#define ARCH_HAS_IRQ_PER_CPU
|
||||
|
||||
static __inline__ int irq_canonicalize(int irq)
|
||||
{
|
||||
return (irq == 2) ? 9 : irq;
|
||||
|
|
|
@ -19,6 +19,11 @@
|
|||
#define IRQ_POLARITY_POSITIVE 0x2 /* high level or low->high edge */
|
||||
#define IRQ_POLARITY_NEGATIVE 0x0 /* low level or high->low edge */
|
||||
|
||||
/*
|
||||
* IRQ line status macro IRQ_PER_CPU is used
|
||||
*/
|
||||
#define ARCH_HAS_IRQ_PER_CPU
|
||||
|
||||
#if defined(CONFIG_40x)
|
||||
#include <asm/ibm4xx.h>
|
||||
|
||||
|
|
|
@ -33,6 +33,11 @@
|
|||
#define IRQ_POLARITY_POSITIVE 0x2 /* high level or low->high edge */
|
||||
#define IRQ_POLARITY_NEGATIVE 0x0 /* low level or high->low edge */
|
||||
|
||||
/*
|
||||
* IRQ line status macro IRQ_PER_CPU is used
|
||||
*/
|
||||
#define ARCH_HAS_IRQ_PER_CPU
|
||||
|
||||
#define get_irq_desc(irq) (&irq_desc[(irq)])
|
||||
|
||||
/* Define a way to iterate across irqs. */
|
||||
|
|
|
@ -32,7 +32,12 @@
|
|||
#define IRQ_WAITING 32 /* IRQ not yet seen - for autodetection */
|
||||
#define IRQ_LEVEL 64 /* IRQ level triggered */
|
||||
#define IRQ_MASKED 128 /* IRQ masked - shouldn't be seen again */
|
||||
#if defined(ARCH_HAS_IRQ_PER_CPU)
|
||||
# define IRQ_PER_CPU 256 /* IRQ is per CPU */
|
||||
# define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU)
|
||||
#else
|
||||
# define CHECK_IRQ_PER_CPU(var) 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Interrupt controller descriptor. This is all we need
|
||||
|
|
|
@ -111,7 +111,7 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs)
|
|||
unsigned int status;
|
||||
|
||||
kstat_this_cpu.irqs[irq]++;
|
||||
if (desc->status & IRQ_PER_CPU) {
|
||||
if (CHECK_IRQ_PER_CPU(desc->status)) {
|
||||
irqreturn_t action_ret;
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue