diff --git a/[refs] b/[refs] index 9b7a34f1c05e..30ccae16bb75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdc6f27d9e3c2f7ca1a3e19c6eabb1ad6a2add5d +refs/heads/master: b019e57321f3e006c0ec7a54f13efc377bcb6451 diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index efc88538b2ba..4669be080617 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/include/linux/irq.h @@ -339,6 +339,13 @@ extern void __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained, const char *name); +/* caller has locked the irq_desc and both params are valid */ +static inline void __set_irq_handler_unlocked(int irq, + irq_flow_handler_t handler) +{ + irq_desc[irq].handle_irq = handler; +} + /* * Set a highlevel flow handler for a given IRQ: */