From 6d7b7ee5c5dd7683a25de8582006011641a731d2 Mon Sep 17 00:00:00 2001
From: Florian Mickler <florian@mickler.org>
Date: Mon, 4 Apr 2011 01:17:40 +0200
Subject: [PATCH] --- yaml --- r: 245674 b: refs/heads/master c:
 711b8c87a5fe6de78e90411cb67b506babfef74a h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/numa_64.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4e42d5ab3c98..1f7c20848299 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b16651f806d35b5c404f2525fbce76afa3c9297
+refs/heads/master: 711b8c87a5fe6de78e90411cb67b506babfef74a
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index 3951ee6eade7..13f5b068e8c2 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/arch/x86/mm/numa_64.c
@@ -505,17 +505,13 @@ static int __init numa_init(int (*init_func)(void))
 
 void __init initmem_init(void)
 {
-	int ret;
-
 	if (!numa_off) {
 #ifdef CONFIG_ACPI_NUMA
-		ret = numa_init(x86_acpi_numa_init);
-		if (!ret)
+		if (!numa_init(x86_acpi_numa_init))
 			return;
 #endif
 #ifdef CONFIG_AMD_NUMA
-		ret = numa_init(amd_numa_init);
-		if (!ret)
+		if (!numa_init(amd_numa_init))
 			return;
 #endif
 	}