diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:05:23 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:05:23 -0400 |
commit | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (patch) | |
tree | 658ebb20e4fd5dee840f27103b59da367ff473b1 /include/linux/irq.h | |
parent | 72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf (diff) | |
parent | 6574612fbb34c63117581e68f2231ddce027e41e (diff) |
Merge branch 'fix/asoc' into topic/asoc
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r-- | include/linux/irq.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index ca507c9426b0..b7cbeed972e4 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -487,6 +487,16 @@ static inline void init_copy_desc_masks(struct irq_desc *old_desc, | |||
487 | #endif | 487 | #endif |
488 | } | 488 | } |
489 | 489 | ||
490 | static inline void free_desc_masks(struct irq_desc *old_desc, | ||
491 | struct irq_desc *new_desc) | ||
492 | { | ||
493 | free_cpumask_var(old_desc->affinity); | ||
494 | |||
495 | #ifdef CONFIG_GENERIC_PENDING_IRQ | ||
496 | free_cpumask_var(old_desc->pending_mask); | ||
497 | #endif | ||
498 | } | ||
499 | |||
490 | #else /* !CONFIG_SMP */ | 500 | #else /* !CONFIG_SMP */ |
491 | 501 | ||
492 | static inline bool init_alloc_desc_masks(struct irq_desc *desc, int cpu, | 502 | static inline bool init_alloc_desc_masks(struct irq_desc *desc, int cpu, |
@@ -500,6 +510,10 @@ static inline void init_copy_desc_masks(struct irq_desc *old_desc, | |||
500 | { | 510 | { |
501 | } | 511 | } |
502 | 512 | ||
513 | static inline void free_desc_masks(struct irq_desc *old_desc, | ||
514 | struct irq_desc *new_desc) | ||
515 | { | ||
516 | } | ||
503 | #endif /* CONFIG_SMP */ | 517 | #endif /* CONFIG_SMP */ |
504 | 518 | ||
505 | #endif /* _LINUX_IRQ_H */ | 519 | #endif /* _LINUX_IRQ_H */ |