Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755379AbYCQVd6 (ORCPT ); Mon, 17 Mar 2008 17:33:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753121AbYCQVdv (ORCPT ); Mon, 17 Mar 2008 17:33:51 -0400 Received: from mx1.redhat.com ([66.187.233.31]:52838 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbYCQVdu (ORCPT ); Mon, 17 Mar 2008 17:33:50 -0400 From: Glauber Costa To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, glommer@gmail.com, mingo@elte.hu, tglx@linutronix.de, Glauber Costa , Ravikiran Thirumalai Subject: [PATCH] vsmp build fixes Date: Mon, 17 Mar 2008 18:30:12 -0300 Message-Id: <1205789412-26851-1-git-send-email-gcosta@redhat.com> X-Mailer: git-send-email 1.5.3.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1542 Lines: 59 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 CC: Ravikiran Thirumalai --- 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 #include #include +#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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/