diff options
| author | Florian Mickler <florian@mickler.org> | 2011-04-04 01:17:40 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-04-04 01:21:00 +0200 |
| commit | 711b8c87a5fe6de78e90411cb67b506babfef74a (patch) | |
| tree | c0fb0f6e0a8fc189d430b384fcfcadbf181fd9ac /arch/x86/mm/numa_64.c | |
| parent | x86: Clean up memory model related configs in arch/x86/Kconfig (diff) | |
| download | linux-711b8c87a5fe6de78e90411cb67b506babfef74a.tar.xz linux-711b8c87a5fe6de78e90411cb67b506babfef74a.zip | |
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@mickler.org>
LKML-Reference: <1301843624-22364-1-git-send-email-florian@mickler.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/mm/numa_64.c')
| -rw-r--r-- | 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 3951ee6eade7..13f5b068e8c2 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 } |