diff options
author | Florian Mickler <florian@mickler.org> | 2011-04-03 19:17:40 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-04-03 19:21:00 -0400 |
commit | 711b8c87a5fe6de78e90411cb67b506babfef74a (patch) | |
tree | c0fb0f6e0a8fc189d430b384fcfcadbf181fd9ac /arch/x86/mm | |
parent | 3b16651f806d35b5c404f2525fbce76afa3c9297 (diff) |
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')
-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)) | |||
505 | 505 | ||
506 | void __init initmem_init(void) | 506 | void __init initmem_init(void) |
507 | { | 507 | { |
508 | int ret; | ||
509 | |||
510 | if (!numa_off) { | 508 | if (!numa_off) { |
511 | #ifdef CONFIG_ACPI_NUMA | 509 | #ifdef CONFIG_ACPI_NUMA |
512 | ret = numa_init(x86_acpi_numa_init); | 510 | if (!numa_init(x86_acpi_numa_init)) |
513 | if (!ret) | ||
514 | return; | 511 | return; |
515 | #endif | 512 | #endif |
516 | #ifdef CONFIG_AMD_NUMA | 513 | #ifdef CONFIG_AMD_NUMA |
517 | ret = numa_init(amd_numa_init); | 514 | if (!numa_init(amd_numa_init)) |
518 | if (!ret) | ||
519 | return; | 515 | return; |
520 | #endif | 516 | #endif |
521 | } | 517 | } |