Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit febcb0c5 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

irq: Remove unnecessary bootmem code 



mem_init is moved early already.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-29-git-send-email-yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 5619c280

kernel/irq/handle.c

+3 −11
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/kernel_stat.h>

#include <linux/rculist.h>

#include <linux/hash.h>

#include <linux/bootmem.h>

#include <trace/events/irq.h>



#include "internals.h"
@@ -87,12 +86,8 @@ void __ref init_kstat_irqs(struct irq_desc *desc, int node, int nr) 
{

	void *ptr;



	if (slab_is_available())

	ptr = kzalloc_node(nr * sizeof(*desc->kstat_irqs),

			   GFP_ATOMIC, node);

	else

		ptr = alloc_bootmem_node(NODE_DATA(node),

				nr * sizeof(*desc->kstat_irqs));



	/*

	 * don't overwite if can not get new one
@@ -219,10 +214,7 @@ struct irq_desc * __ref irq_to_desc_alloc_node(unsigned int irq, int node) 
	if (desc)

		goto out_unlock;



	if (slab_is_available())

	desc = kzalloc_node(sizeof(*desc), GFP_ATOMIC, node);

	else

		desc = alloc_bootmem_node(NODE_DATA(node), sizeof(*desc));



	printk(KERN_DEBUG "  alloc irq_desc for %d on node %d\n", irq, node);

	if (!desc) {