[tip:x86/mm] x86-64, NUMA: Remove unused variable

From: tip-bot for Florian Mickler
Date: Mon Apr 04 2011 - 11:00:38 EST


Commit-ID: 711b8c87a5fe6de78e90411cb67b506babfef74a
Gitweb: http://git.kernel.org/tip/711b8c87a5fe6de78e90411cb67b506babfef74a
Author: Florian Mickler <florian@xxxxxxxxxxx>
AuthorDate: Mon, 4 Apr 2011 01:17:40 +0200
Committer: Tejun Heo <tj@xxxxxxxxxx>
CommitDate: Mon, 4 Apr 2011 01:21:00 +0200

x86-64, NUMA: Remove unused variable

In case !CONFIG_ACPI_NUMA and !CONFIG_AMD_NUMA gcc emits a warning
about the unused variable ret.

As that variable is in fact not needed I choose to remove it.

Signed-off-by: Florian Mickler <florian@xxxxxxxxxxx>
LKML-Reference: <1301843624-22364-1-git-send-email-florian@xxxxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
arch/x86/mm/numa_64.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 3951ee6..13f5b06 100644
--- a/arch/x86/mm/numa_64.c
+++ b/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
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/