diff --git a/[refs] b/[refs] index ab80d7614edd..1464488d9a18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fb530291621c8b8a1b16abeeab05d9262489f71 +refs/heads/master: 22fb4e71e646695c7e0f379ada66b372c2d1aa1a diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c index e161999b6683..104578541230 100644 --- a/trunk/kernel/irq/handle.c +++ b/trunk/kernel/irq/handle.c @@ -164,7 +164,7 @@ int __init early_irq_init(void) node = first_online_node; /* allocate irq_desc_ptrs array based on nr_irqs */ - irq_desc_ptrs = alloc_bootmem(nr_irqs * sizeof(void *)); + irq_desc_ptrs = kcalloc(nr_irqs, sizeof(void *), GFP_NOWAIT); /* allocate based on nr_cpu_ids */ kstat_irqs_legacy = kzalloc_node(NR_IRQS_LEGACY * nr_cpu_ids *