linux-kernel - [PATCH] vsmp build fixes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1205789412-26851-1-git-send-email-gcosta@redhat.com>
Date:	Mon, 17 Mar 2008 18:30:12 -0300
From:	Glauber Costa <gcosta@...hat.com>
To:	linux-kernel@...r.kernel.org
Cc:	akpm@...ux-foundation.org, glommer@...il.com, mingo@...e.hu,
	tglx@...utronix.de, Glauber Costa <gcosta@...hat.com>,
	Ravikiran Thirumalai <kiran@...lemp.com>
Subject: [PATCH] vsmp build fixes

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@...hat.com>
CC: Ravikiran Thirumalai <kiran@...lemp.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/