From 9ebe54a3f6cd0cf65ea77a64cae0bb05d616ef65 Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Wed, 15 Sep 2010 08:05:49 +0000 Subject: [PATCH] --- yaml --- r: 212871 b: refs/heads/master c: e72ed6b509a62605fe9aca195c6037abdda6c1ac h: refs/heads/master i: 212869: 91e1a67c12e297e8bd346289d6c2389b50acc303 212867: e2bc901cde1c68547a5a55285b0b5fabce675989 212863: b277bf504bfe0c2b0dd3d764f8d3af413fd4eebb v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/dlpar.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3ea564ceb5f0..15623ad84d9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45848e0fc1fce399651b3f480bdeb82cc6d3d15a +refs/heads/master: e72ed6b509a62605fe9aca195c6037abdda6c1ac diff --git a/trunk/arch/powerpc/platforms/pseries/dlpar.c b/trunk/arch/powerpc/platforms/pseries/dlpar.c index 75d336ab01bc..b74a9230edc9 100644 --- a/trunk/arch/powerpc/platforms/pseries/dlpar.c +++ b/trunk/arch/powerpc/platforms/pseries/dlpar.c @@ -55,13 +55,12 @@ static struct property *dlpar_parse_cc_property(struct cc_workarea *ccwa) prop->length = ccwa->prop_length; value = (char *)ccwa + ccwa->prop_offset; - prop->value = kzalloc(prop->length, GFP_KERNEL); + prop->value = kmemdup(value, prop->length, GFP_KERNEL); if (!prop->value) { dlpar_free_cc_property(prop); return NULL; } - memcpy(prop->value, value, prop->length); return prop; }