mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge commit 'fixes.2015.02.23a' into core/rcu
Conflicts: kernel/rcu/tree.c Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
commit
8bc6782fe2
11 changed files with 159 additions and 128 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue