2008-08-26 22:14:48

by Hiroshi Shimamoto

Subject: [RESEND][PATCH -tip] x86: acpi: move acpi_mcfg_64bit_base_addr into CONFIG_PCI_MMCONFIG

From: Hiroshi Shimamoto <[email protected]>

acpi_mcfg_64bit_base_addr is used when CONFIG_PCI_MMCONFIG is enabled.

Signed-off-by: Hiroshi Shimamoto <[email protected]>
---
arch/x86/kernel/acpi/boot.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index fc64412..8a1c9f9 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -96,8 +96,6 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
#warning ACPI uses CMPXCHG, i486 and later hardware
#endif

-static int acpi_mcfg_64bit_base_addr __initdata = FALSE;
-
/* --------------------------------------------------------------------------
Boot-time Configuration
-------------------------------------------------------------------------- */
@@ -159,6 +157,8 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
struct acpi_mcfg_allocation *pci_mmcfg_config;
int pci_mmcfg_config_num;

+static int acpi_mcfg_64bit_base_addr __initdata = FALSE;
+
static int __init acpi_mcfg_oem_check(struct acpi_table_mcfg *mcfg)
{
if (!strcmp(mcfg->header.oem_id, "SGI"))
--
1.5.6

2008-08-27 06:25:49

by Ingo Molnar

Subject: Re: [RESEND][PATCH -tip] x86: acpi: move acpi_mcfg_64bit_base_addr into CONFIG_PCI_MMCONFIG

* Hiroshi Shimamoto <[email protected]> wrote:

> From: Hiroshi Shimamoto <[email protected]>
>
> acpi_mcfg_64bit_base_addr is used when CONFIG_PCI_MMCONFIG is enabled.

applied to tip/x86/cleanups, thanks!

Ingo