Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / kernel / irq / internals.h

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index eab521fc547cdfae54b786f21b2b6daca2f9ffc9..09be2c903c6d3fa0d622111f988b0211965ab662 100644 (file)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -163,6 +163,8 @@ irq_put_desc_unlock(struct irq_desc *desc, unsigned long flags)
        __irq_put_desc_unlock(desc, flags, false);
 }
 
+#define __irqd_to_state(d) ACCESS_PRIVATE((d)->common, state_use_accessors)
+
 /*
  * Manipulation functions for irq_data.state
  */
@@ -191,6 +193,8 @@ static inline bool irqd_has_set(struct irq_data *d, unsigned int mask)
        return __irqd_to_state(d) & mask;
 }
 
+#undef __irqd_to_state
+
 static inline void kstat_incr_irqs_this_cpu(struct irq_desc *desc)
 {
        __this_cpu_inc(*desc->kstat_irqs);