From: Glauber Costa <gcosta@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, glommer@gmail.com, mingo@elte.hu,
tglx@linutronix.de, Glauber Costa <gcosta@redhat.com>,
Ravikiran Thirumalai <kiran@scalemp.com>
Subject: [PATCH] vsmp build fixes
Date: Mon, 17 Mar 2008 18:30:12 -0300 [thread overview]
Message-ID: <1205789412-26851-1-git-send-email-gcosta@redhat.com> (raw)
VSMP depends on PCI, but the file is now compiled conditionally
on PARAVIRT, no VSMP, so enclose everything in an ifdef CONFIG_PCI.
We have to be careful enough to let is_vsmp_box and vsmp_init defined,
since they are used outside this file
Signed-off-by: Glauber Costa <gcosta@redhat.com>
CC: Ravikiran Thirumalai <kiran@scalemp.com>
---
arch/x86/kernel/vsmp_64.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index a00961d..ccf23ae 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -19,6 +19,7 @@ #include <asm/pci-direct.h>
#include <asm/io.h>
#include <asm/paravirt.h>
+#ifdef CONFIG_PCI
/*
* Interrupt control on vSMPowered systems:
* ~AC is a shadow of IF. If IF is 'on' AC should be 'off'
@@ -87,12 +88,18 @@ int is_vsmp_box(void)
if (read_pci_config(0, 0x1f, 0, PCI_VENDOR_ID) ==
(PCI_VENDOR_ID_SCALEMP || (PCI_DEVICE_ID_SCALEMP_VSMP_CTL << 16)))
vsmp = 1;
-
return vsmp;
}
+#else
+int is_vsmp_box(void)
+{
+ return 0;
+}
+#endif
void __init vsmp_init(void)
{
+#ifdef CONFIG_PCI
void *address;
unsigned int cap, ctl, cfg;
@@ -125,5 +132,6 @@ void __init vsmp_init(void)
}
early_iounmap(address, 8);
+#endif
return;
}
--
1.4.2
reply other threads:[~2008-03-17 21:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1205789412-26851-1-git-send-email-gcosta@redhat.com \
--to=gcosta@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=glommer@gmail.com \
--cc=kiran@scalemp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®