From 5a0b95df1f2820e3df8bcd6a81c76b87f4c803bd Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 22 Feb 2013 16:32:48 -0800 Subject: [PATCH] --- yaml --- r: 356510 b: refs/heads/master c: a864b9d06c71456470b3544fe4cc07bcdd29828d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/memory_hotplug.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3817cda10d9..0b6b3b1bccfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41badc15cbad0350de34408c1b0c690f9df76d4b +refs/heads/master: a864b9d06c71456470b3544fe4cc07bcdd29828d diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c index d04ed87bfacb..302291429953 100644 --- a/trunk/mm/memory_hotplug.c +++ b/trunk/mm/memory_hotplug.c @@ -901,8 +901,7 @@ int __ref add_memory(int nid, u64 start, u64 size) /* rollback pgdat allocation and others */ if (new_pgdat) rollback_node_hotadd(nid, pgdat); - if (res) - release_memory_resource(res); + release_memory_resource(res); out: unlock_memory_hotplug();