summaryrefslogtreecommitdiffstats
path: root/include/linux/interrupt.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 10:39:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 10:39:22 -0700
commit61d97f4fcf73d30864a52373a34093be25be6a03 (patch)
tree40b6585c6bf500bc68c9107c6d21318542875d1b /include/linux/interrupt.h
parent38c46578ffd8ffbfec514c2a9876d527303322d6 (diff)
parent48627d8d23c34106c1365563604739a50343edaf (diff)
downloadlinux-stable-61d97f4fcf73d30864a52373a34093be25be6a03.tar.gz
linux-stable-61d97f4fcf73d30864a52373a34093be25be6a03.tar.bz2
linux-stable-61d97f4fcf73d30864a52373a34093be25be6a03.zip
Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: remove extraneous checks in manage.c genirq: Expose default irq affinity mask (take 3)
Diffstat (limited to 'include/linux/interrupt.h')
-rw-r--r--include/linux/interrupt.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index a86186dd0474..62aa4f895abe 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -104,8 +104,11 @@ extern void enable_irq(unsigned int irq);
#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
+extern cpumask_t irq_default_affinity;
+
extern int irq_set_affinity(unsigned int irq, cpumask_t cpumask);
extern int irq_can_set_affinity(unsigned int irq);
+extern int irq_select_affinity(unsigned int irq);
#else /* CONFIG_SMP */
@@ -119,6 +122,8 @@ static inline int irq_can_set_affinity(unsigned int irq)
return 0;
}
+static inline int irq_select_affinity(unsigned int irq) { return 0; }
+
#endif /* CONFIG_SMP && CONFIG_GENERIC_HARDIRQS */
#ifdef CONFIG_GENERIC_HARDIRQS