patch-2.4.22 linux-2.4.22/include/asm-arm/mach/irq.h

• Lines: 34
• Date: 2003-08-25 04:44:43.000000000 -0700
• Orig file: linux-2.4.21/include/asm-arm/mach/irq.h
• Orig date: 2001-02-08 16:32:44.000000000 -0800

diff -urN linux-2.4.21/include/asm-arm/mach/irq.h linux-2.4.22/include/asm-arm/mach/irq.h
@@ -11,24 +11,31 @@
 #define __ASM_ARM_MACH_IRQ_H
 
 struct irqdesc {
-	unsigned int	 nomask   : 1;		/* IRQ does not mask in IRQ   */
-	unsigned int	 enabled  : 1;		/* IRQ is currently enabled   */
 	unsigned int	 triggered: 1;		/* IRQ has occurred	      */
+	unsigned int	 running  : 1;		/* IRQ is running             */
+	unsigned int	 pending  : 1;		/* IRQ is pending	      */
 	unsigned int	 probing  : 1;		/* IRQ in use for a probe     */
 	unsigned int	 probe_ok : 1;		/* IRQ can be used for probe  */
 	unsigned int	 valid    : 1;		/* IRQ claimable	      */
 	unsigned int	 noautoenable : 1;	/* don't automatically enable IRQ */
 	unsigned int	 unused   :25;
+	unsigned int	 disable_depth;
+
+	struct list_head pend;
+
 	void (*mask_ack)(unsigned int irq);	/* Mask and acknowledge IRQ   */
 	void (*mask)(unsigned int irq);		/* Mask IRQ		      */
 	void (*unmask)(unsigned int irq);	/* Unmask IRQ		      */
 	struct irqaction *action;
+
 	/*
 	 * IRQ lock detection
 	 */
 	unsigned int	 lck_cnt;
 	unsigned int	 lck_pc;
 	unsigned int	 lck_jif;
+	int		 lck_warned;
+	struct timer_list	lck_timer;
 };
 
 extern struct irqdesc irq_desc[];