diff options
Diffstat (limited to 'include/asm-arm/mach')
| -rw-r--r-- | include/asm-arm/mach/irq.h | 12 | ||||
| -rw-r--r-- | include/asm-arm/mach/time.h | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h index a43a353f6c7..0ce6ca588d8 100644 --- a/include/asm-arm/mach/irq.h +++ b/include/asm-arm/mach/irq.h @@ -42,11 +42,11 @@ struct irqchip { /* * Set the type of the IRQ. */ - int (*type)(unsigned int, unsigned int); + int (*set_type)(unsigned int, unsigned int); /* * Set wakeup-enable on the selected IRQ */ - int (*wake)(unsigned int, unsigned int); + int (*set_wake)(unsigned int, unsigned int); #ifdef CONFIG_SMP /* @@ -92,6 +92,14 @@ struct irqdesc { extern struct irqdesc irq_desc[]; /* + * Helpful inline function for calling irq descriptor handlers. + */ +static inline void desc_handle_irq(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) +{ + desc->handle(irq, desc, regs); +} + +/* * This is internal. Do not use it. */ extern void (*init_arch_irq)(void); diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h index 2cf279a4401..96c6db7dd0e 100644 --- a/include/asm-arm/mach/time.h +++ b/include/asm-arm/mach/time.h @@ -47,9 +47,7 @@ struct sys_timer { #ifdef CONFIG_NO_IDLE_HZ -#define DYN_TICK_SKIPPING (1 << 2) #define DYN_TICK_ENABLED (1 << 1) -#define DYN_TICK_SUITABLE (1 << 0) struct dyn_tick_timer { unsigned int state; /* Current state */ |