From fc53c7fe784d374fdae707a614aa8ab7daa189bc Mon Sep 17 00:00:00 2001 From: "cpw@sgi.com" Date: Tue, 21 Jun 2011 07:21:32 -0500 Subject: [PATCH] --- yaml --- r: 257281 b: refs/heads/master c: bbd270e6f45a5ca30e1d3b6133c516a9dc9dd6c0 h: refs/heads/master i: 257279: 0a5d2c523cb36e38b8626c23563954c279457f04 v: v3 --- [refs] | 2 +- trunk/arch/x86/platform/uv/tlb_uv.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a81e09728417..25c55176671f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 442d3924926c62741912d8a930220af253922007 +refs/heads/master: bbd270e6f45a5ca30e1d3b6133c516a9dc9dd6c0 diff --git a/trunk/arch/x86/platform/uv/tlb_uv.c b/trunk/arch/x86/platform/uv/tlb_uv.c index 5265842b8d0b..db8b915f54bc 100644 --- a/trunk/arch/x86/platform/uv/tlb_uv.c +++ b/trunk/arch/x86/platform/uv/tlb_uv.c @@ -1797,15 +1797,20 @@ static int __init init_per_cpu(int nuvhubs, int base_part_pnode) uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL); if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask)) - return 1; + goto fail; if (summarize_uvhub_sockets(nuvhubs, uvhub_descs, uvhub_mask)) - return 1; + goto fail; kfree(uvhub_descs); kfree(uvhub_mask); init_per_cpu_tunables(); return 0; + +fail: + kfree(uvhub_descs); + kfree(uvhub_mask); + return 1; } /*