diff options
Diffstat (limited to 'arch/x86/pci/mmconfig-shared.c')
-rw-r--r-- | arch/x86/pci/mmconfig-shared.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 704b9ec043d7..fb29968a7cd5 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
@@ -49,7 +49,7 @@ static __init void free_all_mmcfg(void) | |||
49 | pci_mmconfig_remove(cfg); | 49 | pci_mmconfig_remove(cfg); |
50 | } | 50 | } |
51 | 51 | ||
52 | static __devinit void list_add_sorted(struct pci_mmcfg_region *new) | 52 | static void list_add_sorted(struct pci_mmcfg_region *new) |
53 | { | 53 | { |
54 | struct pci_mmcfg_region *cfg; | 54 | struct pci_mmcfg_region *cfg; |
55 | 55 | ||
@@ -65,9 +65,8 @@ static __devinit void list_add_sorted(struct pci_mmcfg_region *new) | |||
65 | list_add_tail_rcu(&new->list, &pci_mmcfg_list); | 65 | list_add_tail_rcu(&new->list, &pci_mmcfg_list); |
66 | } | 66 | } |
67 | 67 | ||
68 | static __devinit struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, | 68 | static struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, int start, |
69 | int start, | 69 | int end, u64 addr) |
70 | int end, u64 addr) | ||
71 | { | 70 | { |
72 | struct pci_mmcfg_region *new; | 71 | struct pci_mmcfg_region *new; |
73 | struct resource *res; | 72 | struct resource *res; |
@@ -371,8 +370,7 @@ static int __init pci_mmcfg_check_hostbridge(void) | |||
371 | return !list_empty(&pci_mmcfg_list); | 370 | return !list_empty(&pci_mmcfg_list); |
372 | } | 371 | } |
373 | 372 | ||
374 | static acpi_status __devinit check_mcfg_resource(struct acpi_resource *res, | 373 | static acpi_status check_mcfg_resource(struct acpi_resource *res, void *data) |
375 | void *data) | ||
376 | { | 374 | { |
377 | struct resource *mcfg_res = data; | 375 | struct resource *mcfg_res = data; |
378 | struct acpi_resource_address64 address; | 376 | struct acpi_resource_address64 address; |
@@ -408,8 +406,8 @@ static acpi_status __devinit check_mcfg_resource(struct acpi_resource *res, | |||
408 | return AE_OK; | 406 | return AE_OK; |
409 | } | 407 | } |
410 | 408 | ||
411 | static acpi_status __devinit find_mboard_resource(acpi_handle handle, u32 lvl, | 409 | static acpi_status find_mboard_resource(acpi_handle handle, u32 lvl, |
412 | void *context, void **rv) | 410 | void *context, void **rv) |
413 | { | 411 | { |
414 | struct resource *mcfg_res = context; | 412 | struct resource *mcfg_res = context; |
415 | 413 | ||
@@ -422,7 +420,7 @@ static acpi_status __devinit find_mboard_resource(acpi_handle handle, u32 lvl, | |||
422 | return AE_OK; | 420 | return AE_OK; |
423 | } | 421 | } |
424 | 422 | ||
425 | static int __devinit is_acpi_reserved(u64 start, u64 end, unsigned not_used) | 423 | static int is_acpi_reserved(u64 start, u64 end, unsigned not_used) |
426 | { | 424 | { |
427 | struct resource mcfg_res; | 425 | struct resource mcfg_res; |
428 | 426 | ||
@@ -693,9 +691,8 @@ static int __init pci_mmcfg_late_insert_resources(void) | |||
693 | late_initcall(pci_mmcfg_late_insert_resources); | 691 | late_initcall(pci_mmcfg_late_insert_resources); |
694 | 692 | ||
695 | /* Add MMCFG information for host bridges */ | 693 | /* Add MMCFG information for host bridges */ |
696 | int __devinit pci_mmconfig_insert(struct device *dev, | 694 | int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, |
697 | u16 seg, u8 start, u8 end, | 695 | phys_addr_t addr) |
698 | phys_addr_t addr) | ||
699 | { | 696 | { |
700 | int rc; | 697 | int rc; |
701 | struct resource *tmp = NULL; | 698 | struct resource *tmp = NULL; |