[PATCH] kernel: replace "kmalloc+memset" with kzalloc in kernel/ dir

Robert P. J. Day
2006-12-03T13:35:21Z

Replace kmalloc()+memset() combination with kzalloc().

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

---

auditfilter.c | 3 +--
futex.c | 4 +---
kexec.c | 3 +--
3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 4f40d92..2e896f8 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -636,10 +636,9 @@ static struct audit_rule *audit_krule_to
struct audit_rule *rule;
int i;

- rule = kmalloc(sizeof(*rule), GFP_KERNEL);
+ rule = kzalloc(sizeof(*rule), GFP_KERNEL);
if (unlikely(!rule))
return NULL;
- memset(rule, 0, sizeof(*rule));

rule->flags = krule->flags | krule->listnr;
rule->action = krule->action;
diff --git a/kernel/futex.c b/kernel/futex.c
index 93ef30b..999bfaf 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -324,12 +324,10 @@ static int refill_pi_state_cache(void)
if (likely(current->pi_state_cache))
return 0;

- pi_state = kmalloc(sizeof(*pi_state), GFP_KERNEL);
-
+ pi_state = kzalloc(sizeof(*pi_state), GFP_KERNEL);
if (!pi_state)
return -ENOMEM;

- memset(pi_state, 0, sizeof(*pi_state));
INIT_LIST_HEAD(&pi_state->list);
/* pi_mutex gets initialized later */
pi_state->owner = NULL;
diff --git a/kernel/kexec.c b/kernel/kexec.c
index fcdd5d2..d43692c 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -108,11 +108,10 @@ static int do_kimage_alloc(struct kimage

/* Allocate a controlling structure */
result = -ENOMEM;
- image = kmalloc(sizeof(*image), GFP_KERNEL);
+ image = kzalloc(sizeof(*image), GFP_KERNEL);
if (!image)
goto out;

- memset(image, 0, sizeof(*image));
image->head = 0;
image->entry = &image->head;
image->last_entry = &image->head;