lkml.org 
[lkml]   [2005]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] kernel: use kcalloc instead kmalloc/memset
    From
    Date
    This patch converts kernel/ to use kcalloc instead of kmalloc/memset.

    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    ---

    intermodule.c | 3 +--
    params.c | 4 ++--
    power/pm.c | 3 +--
    resource.c | 3 +--
    workqueue.c | 3 +--
    5 files changed, 6 insertions(+), 10 deletions(-)

    Index: 2.6/kernel/resource.c
    ===================================================================
    --- 2.6.orig/kernel/resource.c
    +++ 2.6/kernel/resource.c
    @@ -430,10 +430,9 @@ EXPORT_SYMBOL(adjust_resource);
    */
    struct resource * __request_region(struct resource *parent, unsigned long start, unsigned long n, const char *name)
    {
    - struct resource *res = kmalloc(sizeof(*res), GFP_KERNEL);
    + struct resource *res = kcalloc(1, sizeof(*res), GFP_KERNEL);

    if (res) {
    - memset(res, 0, sizeof(*res));
    res->name = name;
    res->start = start;
    res->end = start + n - 1;
    Index: 2.6/kernel/intermodule.c
    ===================================================================
    --- 2.6.orig/kernel/intermodule.c
    +++ 2.6/kernel/intermodule.c
    @@ -39,7 +39,7 @@ void inter_module_register(const char *i
    struct list_head *tmp;
    struct inter_module_entry *ime, *ime_new;

    - if (!(ime_new = kmalloc(sizeof(*ime), GFP_KERNEL))) {
    + if (!(ime_new = kcalloc(1, sizeof(*ime), GFP_KERNEL))) {
    /* Overloaded kernel, not fatal */
    printk(KERN_ERR
    "Aiee, inter_module_register: cannot kmalloc entry for '%s'\n",
    @@ -47,7 +47,6 @@ void inter_module_register(const char *i
    kmalloc_failed = 1;
    return;
    }
    - memset(ime_new, 0, sizeof(*ime_new));
    ime_new->im_name = im_name;
    ime_new->owner = owner;
    ime_new->userdata = userdata;
    Index: 2.6/kernel/params.c
    ===================================================================
    --- 2.6.orig/kernel/params.c
    +++ 2.6/kernel/params.c
    @@ -542,8 +542,8 @@ static void __init kernel_param_sysfs_se
    {
    struct module_kobject *mk;

    - mk = kmalloc(sizeof(struct module_kobject), GFP_KERNEL);
    - memset(mk, 0, sizeof(struct module_kobject));
    + mk = kcalloc(1, sizeof(struct module_kobject), GFP_KERNEL);
    + BUG_ON(!mk);

    mk->mod = THIS_MODULE;
    kobj_set_kset_s(mk, module_subsys);
    Index: 2.6/kernel/power/pm.c
    ===================================================================
    --- 2.6.orig/kernel/power/pm.c
    +++ 2.6/kernel/power/pm.c
    @@ -60,9 +60,8 @@ struct pm_dev *pm_register(pm_dev_t type
    unsigned long id,
    pm_callback callback)
    {
    - struct pm_dev *dev = kmalloc(sizeof(struct pm_dev), GFP_KERNEL);
    + struct pm_dev *dev = kcalloc(1, sizeof(struct pm_dev), GFP_KERNEL);
    if (dev) {
    - memset(dev, 0, sizeof(*dev));
    dev->type = type;
    dev->id = id;
    dev->callback = callback;
    Index: 2.6/kernel/workqueue.c
    ===================================================================
    --- 2.6.orig/kernel/workqueue.c
    +++ 2.6/kernel/workqueue.c
    @@ -310,10 +310,9 @@ struct workqueue_struct *__create_workqu

    BUG_ON(strlen(name) > 10);

    - wq = kmalloc(sizeof(*wq), GFP_KERNEL);
    + wq = kcalloc(1, sizeof(*wq), GFP_KERNEL);
    if (!wq)
    return NULL;
    - memset(wq, 0, sizeof(*wq));

    wq->name = name;
    /* We don't need the distraction of CPUs appearing and vanishing. */

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-08-05 07:33    [W:0.022 / U:0.136 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site