diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-01-29 16:55:56 -0600 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-01-29 16:55:56 -0600 |
commit | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (patch) | |
tree | 356ea7846023503e92e1d5faca68debf1b77a23e /kernel/irq/manage.c | |
parent | aaca4ff0917f62433f222f9fb0d04c1d61ad68cf (diff) | |
parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index cd0cd8dcb345..291f03664552 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -15,17 +15,9 @@ #include "internals.h" -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS) cpumask_var_t irq_default_affinity; -static int init_irq_default_affinity(void) -{ - alloc_cpumask_var(&irq_default_affinity, GFP_KERNEL); - cpumask_setall(irq_default_affinity); - return 0; -} -core_initcall(init_irq_default_affinity); - /** * synchronize_irq - wait for pending IRQ handlers (on other CPUs) * @irq: interrupt number to wait for |