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;