diff --git a/[refs] b/[refs] index cc464b50e821..da6fe7a35620 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7a297b0d7d6049bd4e423ac1e17da31e4c401b8 +refs/heads/master: 4308ad801193f14ff42cb746da37cf07e35f0d08 diff --git a/trunk/kernel/irq/proc.c b/trunk/kernel/irq/proc.c index 4f9427a30e14..09a2ee540bd2 100644 --- a/trunk/kernel/irq/proc.c +++ b/trunk/kernel/irq/proc.c @@ -38,14 +38,12 @@ static int irq_affinity_hint_proc_show(struct seq_file *m, void *v) unsigned long flags; cpumask_var_t mask; - if (!alloc_cpumask_var(&mask, GFP_KERNEL)) + if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; raw_spin_lock_irqsave(&desc->lock, flags); if (desc->affinity_hint) cpumask_copy(mask, desc->affinity_hint); - else - cpumask_setall(mask); raw_spin_unlock_irqrestore(&desc->lock, flags); seq_cpumask(m, mask);