powerpc-genirq: port legacy powermac PIC to genirq
Subsystems (2)
PATCH 1/1 powerpc-genirq: port legacy powermac PIC to genirq
This patch ports the legacy powermac PIC to genirq.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
Patch depends on Ingo/Thomas genirq patchset. It's not to be merged right away, It's being posted here for comments as I may have further rework.
arch/powerpc/kernel/irq.c +6 -7
@@ -62,28 +62,27 @@#endif int __irq_offset_value; -#ifdef CONFIG_PPC32 -EXPORT_SYMBOL (__irq_offset_value); -#endif -static int ppc_spurious_interrupts;#ifdef CONFIG_PPC32 -#define NR_MASK_WORDS ((NR_IRQS + 31) / 32) +EXPORT_SYMBOL (__irq_offset_value); +atomic_t ppc_n_lost_interrupts; +#ifndef CONFIG_PPC_MERGE +#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)unsigned long ppc_cached_irq_mask[NR_MASK_WORDS ]; -atomic_t ppc_n_lost_interrupts; +#endif #ifdef CONFIG_TAU_INT extern int tau_initialized;extern int tau_interrupts (int );#endif +#endif /* CONFIG_PPC32 */ #if defined(CONFIG_SMP ) && !defined(CONFIG_PPC_MERGE )extern atomic_t ipi_recv;extern atomic_t ipi_sent;#endif -#endif /* CONFIG_PPC32 */ #ifdef CONFIG_PPC64 EXPORT_SYMBOL (irq_desc);
arch/powerpc/platforms/powermac/pic.c +89 -65
275 lines not on this page · raw message
include/asm-powerpc/irq.h +3 -0
@@ -429,9 +429,12 @@ extern u64 ppc64_interrupt_controller;#endif +#ifndef CONFIG_PPC_MERGE #define NR_MASK_WORDS ((NR_IRQS + 31) / 32)/* pedantic: these are long because they are used with set_bit --RR */ extern unsigned long ppc_cached_irq_mask[NR_MASK_WORDS ]; +#endif +extern atomic_t ppc_n_lost_interrupts;#define virt_irq_create_mapping (x) (x)