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

Commit dd392710 authored by Pekka J Enberg's avatar Pekka J Enberg Committed by Linus Torvalds
Browse files

[PATCH] introduce and use kzalloc 



This patch introduces a kzalloc wrapper and converts kernel/ to use it.  It
saves a little program text.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 640e8033

include/linux/slab.h

+15 −1
Original line number Diff line number Diff line
@@ -99,7 +99,21 @@ found: 
	return __kmalloc(size, flags);

}



extern void *kcalloc(size_t, size_t, unsigned int __nocast);

extern void *kzalloc(size_t, unsigned int __nocast);



/**

 * kcalloc - allocate memory for an array. The memory is set to zero.

 * @n: number of elements.

 * @size: element size.

 * @flags: the type of memory to allocate.

 */

static inline void *kcalloc(size_t n, size_t size, unsigned int __nocast flags)

{

	if (n != 0 && size > INT_MAX / n)

		return NULL;

	return kzalloc(n * size, flags);

}



extern void kfree(const void *);

extern unsigned int ksize(const void *);

kernel/intermodule.c

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void inter_module_register(const char *im_name, struct module *owner, const void 
	struct list_head *tmp;

	struct inter_module_entry *ime, *ime_new;



	if (!(ime_new = kmalloc(sizeof(*ime), GFP_KERNEL))) {

	if (!(ime_new = kzalloc(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 *im_name, struct module *owner, const void 
		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;

kernel/params.c

+2 −2
Original line number Diff line number Diff line
@@ -542,8 +542,8 @@ static void __init kernel_param_sysfs_setup(const char *name, 
{

	struct module_kobject *mk;



	mk = kmalloc(sizeof(struct module_kobject), GFP_KERNEL);

	memset(mk, 0, sizeof(struct module_kobject));

	mk = kzalloc(sizeof(struct module_kobject), GFP_KERNEL);

	BUG_ON(!mk);



	mk->mod = THIS_MODULE;

	kobj_set_kset_s(mk, module_subsys);

kernel/power/pm.c

+1 −2
Original line number Diff line number Diff line
@@ -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 = kzalloc(sizeof(struct pm_dev), GFP_KERNEL);

	if (dev) {

		memset(dev, 0, sizeof(*dev));

		dev->type = type;

		dev->id = id;

		dev->callback = callback;

kernel/resource.c

+1 −2
Original line number Diff line number Diff line
@@ -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 = kzalloc(sizeof(*res), GFP_KERNEL);



	if (res) {

		memset(res, 0, sizeof(*res));

		res->name = name;

		res->start = start;

		res->end = start + n - 1;