From: tip-bot for Florian Mickler <florian@mickler.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
florian@mickler.org, tj@kernel.org, tglx@linutronix.de
Subject: [tip:x86/mm] x86-64, NUMA: Remove unused variable
Date: Mon, 4 Apr 2011 15:00:08 GMT [thread overview]
Message-ID: <tip-711b8c87a5fe6de78e90411cb67b506babfef74a@git.kernel.org> (raw)
In-Reply-To: <1301843624-22364-1-git-send-email-florian@mickler.org>
Commit-ID: 711b8c87a5fe6de78e90411cb67b506babfef74a
Gitweb: http://git.kernel.org/tip/711b8c87a5fe6de78e90411cb67b506babfef74a
Author: Florian Mickler <florian@mickler.org>
AuthorDate: Mon, 4 Apr 2011 01:17:40 +0200
Committer: Tejun Heo <tj@kernel.org>
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@mickler.org>
LKML-Reference: <1301843624-22364-1-git-send-email-florian@mickler.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
---
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
}
next prev parent reply other threads:[~2011-04-04 15:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-03 15:13 [PATCH] x86, numa_64: remove " Florian Mickler
2011-04-03 15:25 ` Cyrill Gorcunov
2011-04-03 23:20 ` Tejun Heo
2011-04-04 15:00 ` tip-bot for Florian Mickler [this message]
2011-04-05 3:29 ` David Rientjes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-711b8c87a5fe6de78e90411cb67b506babfef74a@git.kernel.org \
--to=florian@mickler.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome