Merge branch 'linus' into core/percpu

Conflicts:
	kernel/irq/handle.c
This commit is contained in:
Ingo Molnar
2009-01-30 18:23:30 +01:00
293 changed files with 10178 additions and 4209 deletions

View File

@@ -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