From 93befb9623102dab0d6b070160a3b8907f1aa5b4 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Tue, 6 Sep 2005 15:18:32 -0700
Subject: [PATCH] --- yaml --- r: 7445 b: refs/heads/master c:
 874ca6cd3fb454f4dfafd2bbb6c6893303227c3f h: refs/heads/master i:   7443:
 856da0deb7c50bc125bf6c5c429a40158bbba103 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/ppc64/kernel/pSeries_reconfig.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 56702eb9a942..f8cafa6144b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f96cb1f0580324b95b7219466312a376a59a796f
+refs/heads/master: 874ca6cd3fb454f4dfafd2bbb6c6893303227c3f
diff --git a/trunk/arch/ppc64/kernel/pSeries_reconfig.c b/trunk/arch/ppc64/kernel/pSeries_reconfig.c
index dc2a69d412a2..58c61219d08e 100644
--- a/trunk/arch/ppc64/kernel/pSeries_reconfig.c
+++ b/trunk/arch/ppc64/kernel/pSeries_reconfig.c
@@ -111,7 +111,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
 	struct device_node *np;
 	int err = -ENOMEM;
 
-	np = kcalloc(1, sizeof(*np), GFP_KERNEL);
+	np = kzalloc(sizeof(*np), GFP_KERNEL);
 	if (!np)
 		goto out_err;