All of lore.kernel.org
 help / color / mirror / Atom feed
* + x86-vsmp-build-fixes.patch added to -mm tree
@ 2008-03-18  5:14 akpm
  2008-03-18  5:26 ` Yinghai Lu
  0 siblings, 1 reply; 7+ messages in thread
From: akpm @ 2008-03-18  5:14 UTC (permalink / raw)
  To: mm-commits; +Cc: gcosta, kiran, mingo, tglx


The patch titled
     x86: vsmp build fixes
has been added to the -mm tree.  Its filename is
     x86-vsmp-build-fixes.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: x86: vsmp build fixes
From: Glauber Costa <gcosta@redhat.com>

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>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/kernel/vsmp_64.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff -puN arch/x86/kernel/vsmp_64.c~x86-vsmp-build-fixes arch/x86/kernel/vsmp_64.c
--- a/arch/x86/kernel/vsmp_64.c~x86-vsmp-build-fixes
+++ a/arch/x86/kernel/vsmp_64.c
@@ -19,6 +19,7 @@
 #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;
 }
_

Patches currently in -mm which might be from gcosta@redhat.com are

git-x86.patch
fix-typo-in-tick-broadcastc.patch
git-kvm.patch
x86-vsmp-build-fixes.patch


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-03-18  9:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-18  5:14 + x86-vsmp-build-fixes.patch added to -mm tree akpm
2008-03-18  5:26 ` Yinghai Lu
2008-03-18  7:28   ` Ravikiran Thirumalai
2008-03-18  7:56     ` Yinghai Lu
2008-03-18  8:25     ` Yinghai Lu
2008-03-18  8:37       ` Fwd: " Yinghai Lu
2008-03-18  9:40   ` Glauber Costa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.