Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 117372
b: refs/heads/master
c: 1339c36
h: refs/heads/master
v: v3
  • Loading branch information
Pavel Vasilyev authored and Len Brown committed Oct 15, 2008
1 parent c96b94c commit 267bf34
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3cef8f6eba47a10b80aa3e7a99e27110e34f3df
refs/heads/master: 1339c367a842a9fc34b8fcfa1abadb07b11848ad
4 changes: 3 additions & 1 deletion trunk/arch/x86/kernel/acpi/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,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
Expand Down Expand Up @@ -156,6 +155,9 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
}

#ifdef CONFIG_PCI_MMCONFIG

static int acpi_mcfg_64bit_base_addr __initdata = FALSE;

/* The physical address of the MMCONFIG aperture. Set from ACPI tables. */
struct acpi_mcfg_allocation *pci_mmcfg_config;
int pci_mmcfg_config_num;
Expand Down

0 comments on commit 267bf34

Please sign in to comment.