lkml.org 
[lkml]   [2010]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/8] irq: remove not need bootmem code
    mem_init is moved early already.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    kernel/irq/handle.c | 14 +++-----------
    1 files changed, 3 insertions(+), 11 deletions(-)

    diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
    index 814940e..0e823c0 100644
    --- a/kernel/irq/handle.c
    +++ b/kernel/irq/handle.c
    @@ -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));
    + ptr = kzalloc_node(nr * sizeof(*desc->kstat_irqs),
    + GFP_ATOMIC, node);

    /*
    * 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));
    + desc = kzalloc_node(sizeof(*desc), GFP_ATOMIC, node);

    printk(KERN_DEBUG " alloc irq_desc for %d on node %d\n", irq, node);
    if (!desc) {
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-02-13 03:53    [W:0.020 / U:154.580 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site