Home » Mailing list archives » linux-kernel » 2008 » August » 12

[PATCH] x86: acpi: move acpi_mcfg_64bit_base_addr into CONFIG_PCI_MMCONFIG

Previous thread: Re: [PATCH 1/13 v3] viafb: fix for the description of the VX800 2D acceleration issue in viafb.txt. by Andrew Morton on Tuesday, August 12, 2008 - 4:09 pm. (1 message)

Next thread: Re: HPET regression in 2.6.26 versus 2.6.25 -- experimental revert for 2.6.27 failed by David Witbrodt on Tuesday, August 12, 2008 - 5:00 pm. (2 messages)
[view original message]
From: Hiroshi Shimamoto
Subject: [PATCH] x86: acpi: move acpi_mcfg_64bit_base_addr into CONFIG_PCI_MMCONFIG
Date: Tuesday, August 12, 2008 - 4:33 pm

From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>

acpi_mcfg_64bit_base_addr is used when CONFIG_PCI_MMCONFIG is enabled.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
---
 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 5c89f1e..267e684 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

--


[ message continues ]
Previous thread: Re: [PATCH 1/13 v3] viafb: fix for the description of the VX800 2D acceleration issue in viafb.txt. by Andrew Morton on Tuesday, August 12, 2008 - 4:09 pm. (1 message)

Next thread: Re: HPET regression in 2.6.26 versus 2.6.25 -- experimental revert for 2.6.27 failed by David Witbrodt on Tuesday, August 12, 2008 - 5:00 pm. (2 messages)