From: tip-bot for Andreas Ruprecht <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
travis@sgi.com, torvalds@linux-foundation.org,
rupran@einserver.de, hedi@sgi.com, sivanich@sgi.com, rja@sgi.com,
tglx@linutronix.de, rientjes@google.com
Subject: [tip:x86/uv] x86/apic/uv: Remove unnecessary #ifdef
Date: Wed, 20 Aug 2014 11:46:50 -0700 [thread overview]
Message-ID: <tip-8091c1f8ea2374695c105591179b1269fb5f2fbb@git.kernel.org> (raw)
In-Reply-To: <1408522561-23389-1-git-send-email-rupran@einserver.de>
Commit-ID: 8091c1f8ea2374695c105591179b1269fb5f2fbb
Gitweb: http://git.kernel.org/tip/8091c1f8ea2374695c105591179b1269fb5f2fbb
Author: Andreas Ruprecht <rupran@einserver.de>
AuthorDate: Wed, 20 Aug 2014 10:16:01 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 20 Aug 2014 15:05:30 +0200
x86/apic/uv: Remove unnecessary #ifdef
In the file x2apic_uv_x.c, some code is compiled conditionally
depending on CONFIG_SMP. However, the file is only built, if
CONFIG_X86_UV is enabled.
CONFIG_X86_UV depends on CONFIG_NUMA, which itself depends on
CONFIG_SMP, so the #ifdef will always evaluate to true, if the
file is compiled. Thus, it is unnecessary and can be removed.
Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Hedi Berriche <hedi@sgi.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Travis <travis@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Link: http://lkml.kernel.org/r/1408522561-23389-1-git-send-email-rupran@einserver.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 293b41d..2f1b5e0 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -204,7 +204,6 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second);
static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
{
-#ifdef CONFIG_SMP
unsigned long val;
int pnode;
@@ -223,7 +222,6 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
atomic_set(&init_deasserted, 1);
-#endif
return 0;
}
prev parent reply other threads:[~2014-08-20 18:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-20 8:16 [PATCH] arch: x86: kernel: apic: Remove unnecessary ifdef Andreas Ruprecht
2014-08-20 18:46 ` tip-bot for Andreas Ruprecht [this message]
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-8091c1f8ea2374695c105591179b1269fb5f2fbb@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hedi@sgi.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rientjes@google.com \
--cc=rja@sgi.com \
--cc=rupran@einserver.de \
--cc=sivanich@sgi.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=travis@sgi.com \
/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