diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-21 14:09:51 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-27 20:32:01 -0400 |
commit | 7ba3e4f5877466b0f81dcd3cb78db5d75b267645 (patch) | |
tree | 239e0f2cc10907e82dabd61b317c8ac6a6baac1b | |
parent | 90128997815009686ec9d72a4b1490455d838e66 (diff) |
powerpc: Remove NO_IRQ_IGNORE
Now that legacy iSeries is gone, this is no longer used.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/include/asm/irq.h | 6 | ||||
-rw-r--r-- | arch/powerpc/include/asm/machdep.h | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/irq.c | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h index fe0b09dceb7d..cf417e510736 100644 --- a/arch/powerpc/include/asm/irq.h +++ b/arch/powerpc/include/asm/irq.h | |||
@@ -27,12 +27,6 @@ extern atomic_t ppc_n_lost_interrupts; | |||
27 | /* This number is used when no interrupt has been assigned */ | 27 | /* This number is used when no interrupt has been assigned */ |
28 | #define NO_IRQ (0) | 28 | #define NO_IRQ (0) |
29 | 29 | ||
30 | /* This is a special irq number to return from get_irq() to tell that | ||
31 | * no interrupt happened _and_ ignore it (don't count it as bad). Some | ||
32 | * platforms like iSeries rely on that. | ||
33 | */ | ||
34 | #define NO_IRQ_IGNORE ((unsigned int)-1) | ||
35 | |||
36 | /* Total number of virq in the platform */ | 30 | /* Total number of virq in the platform */ |
37 | #define NR_IRQS CONFIG_NR_IRQS | 31 | #define NR_IRQS CONFIG_NR_IRQS |
38 | 32 | ||
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index bf37931d1ad6..42ce570812c1 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h | |||
@@ -99,9 +99,7 @@ struct machdep_calls { | |||
99 | 99 | ||
100 | void (*init_IRQ)(void); | 100 | void (*init_IRQ)(void); |
101 | 101 | ||
102 | /* Return an irq, or NO_IRQ to indicate there are none pending. | 102 | /* Return an irq, or NO_IRQ to indicate there are none pending. */ |
103 | * If for some reason there is no irq, but the interrupt | ||
104 | * shouldn't be counted as spurious, return NO_IRQ_IGNORE. */ | ||
105 | unsigned int (*get_irq)(void); | 103 | unsigned int (*get_irq)(void); |
106 | 104 | ||
107 | /* PCI stuff */ | 105 | /* PCI stuff */ |
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index a3d128e94cff..46ce5f733511 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -445,9 +445,9 @@ void do_IRQ(struct pt_regs *regs) | |||
445 | may_hard_irq_enable(); | 445 | may_hard_irq_enable(); |
446 | 446 | ||
447 | /* And finally process it */ | 447 | /* And finally process it */ |
448 | if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) | 448 | if (irq != NO_IRQ) |
449 | handle_one_irq(irq); | 449 | handle_one_irq(irq); |
450 | else if (irq != NO_IRQ_IGNORE) | 450 | else |
451 | __get_cpu_var(irq_stat).spurious_irqs++; | 451 | __get_cpu_var(irq_stat).spurious_irqs++; |
452 | 452 | ||
453 | irq_exit(); | 453 | irq_exit(); |