Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / include / asm-powerpc / irq.h

diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
index 225dc182ef3bc3b4e8f7b7824c932fe8b8555004..7bc6d73b2823c5032852d3b1ae57b8db569795e8 100644 (file)
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -54,6 +54,13 @@
  */
 extern unsigned int virt_irq_to_real_map[NR_IRQS];
 
+/* The maximum virtual IRQ number that we support.  This
+ * can be set by the platform and will be reduced by the
+ * value of __irq_offset_value.  It defaults to and is
+ * capped by (NR_IRQS - 1).
+ */
+extern unsigned int virt_irq_max;
+
 /* Create a mapping for a real_irq if it doesn't already exist.
  * Return the virtual irq as a convenience.
  */
@@ -389,6 +396,7 @@ extern u64 ppc64_interrupt_controller;
 #define        SIU_INT_TIMER4          ((uint)0x0f + CPM_IRQ_OFFSET)
 #define        SIU_INT_TMCNT           ((uint)0x10 + CPM_IRQ_OFFSET)
 #define        SIU_INT_PIT             ((uint)0x11 + CPM_IRQ_OFFSET)
+#define        SIU_INT_PCI             ((uint)0x12 + CPM_IRQ_OFFSET)
 #define        SIU_INT_IRQ1            ((uint)0x13 + CPM_IRQ_OFFSET)
 #define        SIU_INT_IRQ2            ((uint)0x14 + CPM_IRQ_OFFSET)
 #define        SIU_INT_IRQ3            ((uint)0x15 + CPM_IRQ_OFFSET)
@@ -429,7 +437,6 @@ extern u64 ppc64_interrupt_controller;
 #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];
-extern unsigned long ppc_lost_interrupts[NR_MASK_WORDS];
 extern atomic_t ppc_n_lost_interrupts;
 
 #define virt_irq_create_mapping(x)     (x)
@@ -479,6 +486,10 @@ extern int distribute_irqs;
 struct irqaction;
 struct pt_regs;
 
+#define __ARCH_HAS_DO_SOFTIRQ
+
+extern void __do_softirq(void);
+
 #ifdef CONFIG_IRQSTACKS
 /*
  * Per-cpu stacks for handling hard and soft interrupts.
@@ -491,8 +502,6 @@ extern void call_do_softirq(struct thread_info *tp);
 extern int call___do_IRQ(int irq, struct pt_regs *regs,
                struct thread_info *tp);
 
-#define __ARCH_HAS_DO_SOFTIRQ
-
 #else
 #define irq_ctx_init()