Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8172608 authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: acpi: move acpi_mcfg_64bit_base_addr into CONFIG_PCI_MMCONFIG 



acpi_mcfg_64bit_base_addr is used when CONFIG_PCI_MMCONFIG is enabled.

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent bdd31461

arch/x86/kernel/acpi/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -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"))