Merge remote-tracking branch 'rcu/rcu/next'

[karo-tx-linux.git] / include / linux / irq.h

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 3c1c96786248cb02d2d9792cce455892323ef275..cd14cd4a22b4379a37b408ca6a51b8b402838045 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -137,7 +137,7 @@ struct irq_domain;
  * @msi_desc:          MSI descriptor
  */
 struct irq_common_data {
-       unsigned int            state_use_accessors;
+       unsigned int            __private state_use_accessors;
 #ifdef CONFIG_NUMA
        unsigned int            node;
 #endif
@@ -208,7 +208,7 @@ enum {
        IRQD_FORWARDED_TO_VCPU          = (1 << 20),
 };
 
-#define __irqd_to_state(d)             ((d)->common->state_use_accessors)
+#define __irqd_to_state(d) ACCESS_PRIVATE((d)->common, state_use_accessors)
 
 static inline bool irqd_is_setaffinity_pending(struct irq_data *d)
 {
@@ -299,6 +299,8 @@ static inline void irqd_clr_forwarded_to_vcpu(struct irq_data *d)
        __irqd_to_state(d) &= ~IRQD_FORWARDED_TO_VCPU;
 }
 
+#undef __irqd_to_state
+
 static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)
 {
        return d->hwirq;