diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-15 09:00:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-15 09:01:06 +0100 |
| commit | 8bc6782fe20bd2584c73a35c47329c9fd0a8d34c (patch) | |
| tree | c7fc6f467ee212e4ef442e70843c48fcf3c67c17 /kernel/irq | |
| parent | Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | rcu: Remove rcu_user_hooks_switch (diff) | |
| download | linux-8bc6782fe20bd2584c73a35c47329c9fd0a8d34c.tar.xz linux-8bc6782fe20bd2584c73a35c47329c9fd0a8d34c.zip | |
Merge commit 'fixes.2015.02.23a' into core/rcu
Conflicts:
kernel/rcu/tree.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/internals.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index fcab63c66905..3d182932d2d1 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -160,6 +160,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 */ @@ -188,6 +190,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); |