Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752995AbZGWIeX (ORCPT ); Thu, 23 Jul 2009 04:34:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752648AbZGWIeW (ORCPT ); Thu, 23 Jul 2009 04:34:22 -0400 Received: from mga14.intel.com ([143.182.124.37]:11899 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752817AbZGWIeT (ORCPT ); Thu, 23 Jul 2009 04:34:19 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.43,253,1246863600"; d="scan'208";a="168062188" Date: Thu, 23 Jul 2009 16:33:22 +0800 From: Feng Tang To: Randy Dunlap CC: Alexander Beregalov , linux-next , "Brown, Len" , "Linux Kernel Mailing List" , "linux-acpi@vger.kernel.org" Subject: Re: next: sfi build fails when !CONFIG_ACPI Message-ID: <20090723163322.615e1f8e@feng-desktop> In-Reply-To: <20090722150617.13c24350.randy.dunlap@oracle.com> References: <20090722150617.13c24350.randy.dunlap@oracle.com> Organization: intel X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; i486-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4101 Lines: 123 On Thu, 23 Jul 2009 06:06:17 +0800 Randy Dunlap wrote: > On Thu, 16 Jul 2009 12:48:01 +0400 Alexander Beregalov wrote: > > > Hi > > > > drivers/sfi/sfi_core.c: In function 'sfi_init': > > drivers/sfi/sfi_core.c:346: error: 'acpi_disabled' undeclared (first > > use in this function) > > drivers/sfi/sfi_core.c:346: error: (Each undeclared identifier is > > reported only once > > drivers/sfi/sfi_core.c:346: error: for each function it appears in.) > > > > > > $ grep ACPI .config > > # Power management and ACPI options > > -- > > next-20090722 still fails on x86_32 when SFI=y & ACPI=n: > > arch/x86/pci/mmconfig_32.c:34: error: invalid use of undefined type > 'struct acpi_mcfg_allocation' arch/x86/pci/mmconfig_32.c:34: error: > dereferencing pointer to incomplete type > arch/x86/pci/mmconfig_32.c:35: error: dereferencing pointer to > incomplete type arch/x86/pci/mmconfig_32.c:36: error: dereferencing > pointer to incomplete type arch/x86/pci/mmconfig_32.c:37: error: > dereferencing pointer to incomplete type > arch/x86/pci/mmconfig_32.c:38: error: dereferencing pointer to > incomplete type > > config is attached. Hi Randy, Thanks for the catch. Could you try the following patch? thanks! - Feng diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 25a0d9f..e89bf33 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c @@ -557,15 +557,15 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header) i -= sizeof(struct acpi_mcfg_allocation); }; if (pci_mmcfg_config_num == 0) { - printk(KERN_ERR PREFIX "MMCONFIG has no entries\n"); + printk(KERN_ERR "PCI: MMCONFIG has no entries\n"); return -ENODEV; } config_size = pci_mmcfg_config_num * sizeof(*pci_mmcfg_config); pci_mmcfg_config = kmalloc(config_size, GFP_KERNEL); if (!pci_mmcfg_config) { - printk(KERN_WARNING PREFIX - "No memory for MCFG config tables\n"); + printk(KERN_WARNING + "PCI: No memory for MCFG config tables\n"); return -ENOMEM; } @@ -576,8 +576,8 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header) for (i = 0; i < pci_mmcfg_config_num; ++i) { if ((pci_mmcfg_config[i].address > 0xFFFFFFFF) && !acpi_mcfg_64bit_base_addr) { - printk(KERN_ERR PREFIX - "MMCONFIG not in low 4GB of memory\n"); + printk(KERN_ERR + "PCI: MMCONFIG not in low 4GB of memory\n"); kfree(pci_mmcfg_config); pci_mmcfg_config_num = 0; return -ENODEV; @@ -609,7 +609,9 @@ static void __init __pci_mmcfg_init(int early) if (!known_bridge) x86_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg); +#ifdef CONFIG_ACPI pci_mmcfg_reject_broken(early); +#endif if ((pci_mmcfg_config_num == 0) || (pci_mmcfg_config == NULL) || diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c index 8b2d561..f10a7e9 100644 --- a/arch/x86/pci/mmconfig_32.c +++ b/arch/x86/pci/mmconfig_32.c @@ -11,9 +11,9 @@ #include #include -#include #include #include +#include /* Assume systems with more busses have correct MCFG */ #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG)) diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h index 356d0a2..3c645bb 100644 --- a/include/linux/sfi_acpi.h +++ b/include/linux/sfi_acpi.h @@ -50,8 +50,10 @@ extern int sfi_acpi_table_parse(char *signature, char *oem_id, static inline int x86_table_parse(char *signature, int (*handler)(struct acpi_table_header *)) { +#ifdef CONFIG_ACPI if (!acpi_table_parse(signature, handler)) return 0; +#endif return sfi_acpi_table_parse(signature, NULL, NULL, handler); } > > --- > ~Randy > LPC 2009, Sept. 23-25, Portland, Oregon > http://linuxplumbersconf.org/2009/ -- 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/