|
@@ -19,7 +19,6 @@
|
|
#include <linux/kernel_stat.h>
|
|
#include <linux/kernel_stat.h>
|
|
#include <linux/rculist.h>
|
|
#include <linux/rculist.h>
|
|
#include <linux/hash.h>
|
|
#include <linux/hash.h>
|
|
-#include <linux/bootmem.h>
|
|
|
|
#include <trace/events/irq.h>
|
|
#include <trace/events/irq.h>
|
|
|
|
|
|
#include "internals.h"
|
|
#include "internals.h"
|
|
@@ -87,12 +86,8 @@ void __ref init_kstat_irqs(struct irq_desc *desc, int node, int nr)
|
|
{
|
|
{
|
|
void *ptr;
|
|
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));
|
|
|
|
|
|
+ ptr = kzalloc_node(nr * sizeof(*desc->kstat_irqs),
|
|
|
|
+ GFP_ATOMIC, node);
|
|
|
|
|
|
/*
|
|
/*
|
|
* don't overwite if can not get new one
|
|
* 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)
|
|
if (desc)
|
|
goto out_unlock;
|
|
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));
|
|
|
|
|
|
+ desc = kzalloc_node(sizeof(*desc), GFP_ATOMIC, node);
|
|
|
|
|
|
printk(KERN_DEBUG " alloc irq_desc for %d on node %d\n", irq, node);
|
|
printk(KERN_DEBUG " alloc irq_desc for %d on node %d\n", irq, node);
|
|
if (!desc) {
|
|
if (!desc) {
|