diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 09:52:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 09:52:30 -0700 |
| commit | 6d21491838a2a9f22843c7530b118596ee9f4d77 (patch) | |
| tree | 9dcd7a4009d219092c391454efc3dd29b23f52d7 /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| parent | slab: setup cpu caches later on when interrupts are enabled (diff) | |
| download | linux-dev-6d21491838a2a9f22843c7530b118596ee9f4d77.tar.xz linux-dev-6d21491838a2a9f22843c7530b118596ee9f4d77.zip | |
Merge branch 'topic/slab/earlyboot-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'topic/slab/earlyboot-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slab: setup cpu caches later on when interrupts are enabled
slab,slub: don't enable interrupts during early boot
slab: fix gfp flag in setup_cpu_cache()
x86: make zap_low_mapping could be used early
irq: slab alloc for default irq_affinity
memcg: fix page_cgroup fatal error in FLATMEM
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/handle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 104578541230..065205bdd920 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -45,7 +45,7 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc) #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS) static void __init init_irq_default_affinity(void) { - alloc_bootmem_cpumask_var(&irq_default_affinity); + alloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); cpumask_setall(irq_default_affinity); } #else |