redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'pci/myron-final-fixups-v2' into next

Browse source 
* pci/myron-final-fixups-v2:
  PCI: fix undefined reference to 'pci_fixup_final_inited'
This commit is contained in:
Bjorn Helgaas 2012-07-16 09:17:43 -06:00
parent cfeeb34bc0 95df8b8708
commit 8d20e2cfeb
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/pci/bus.c
View file

@ -164,10 +164,8 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
int pci_bus_add_device(struct pci_dev *dev)
{
int retval;
extern bool pci_fixup_final_inited;
if (pci_fixup_final_inited)
pci_fixup_device(pci_fixup_final, dev);
pci_fixup_device(pci_fixup_final, dev);
retval = device_add(&dev->dev);
if (retval)
return retval;

20
drivers/pci/quirks.c
View file

@ -2956,6 +2956,7 @@ extern struct pci_fixup __end_pci_fixups_resume_early[];
extern struct pci_fixup __start_pci_fixups_suspend[];
extern struct pci_fixup __end_pci_fixups_suspend[];
static bool pci_apply_fixup_final_quirks;
void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
{
@ -2973,6 +2974,8 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
break;
case pci_fixup_final:
if (!pci_apply_fixup_final_quirks)
return;
start = __start_pci_fixups_final;
end = __end_pci_fixups_final;
break;
@ -3006,21 +3009,6 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
EXPORT_SYMBOL(pci_fixup_device);
/*
* The global variable 'pci_fixup_final_inited' is being used as a interim
* solution for calling the final quirks only during hot-plug events (not
* during boot processing).
*
* When the boot path's PCI device setup sequencing is addressed, we can
* remove the instance, and usages of, 'pci_fixup_final_inited' along with
* removing 'fs_initcall_sync(pci_apply_final_quirks);' and end up with a
* single, uniform, solution that satisfies both the boot path and the
* various hot-plug event paths.
*
* ToDo: Remove 'pci_fixup_final_inited'
*/
bool pci_fixup_final_inited;
static int __init pci_apply_final_quirks(void)
{
struct pci_dev *dev = NULL;
@ -3031,6 +3019,7 @@ static int __init pci_apply_final_quirks(void)
printk(KERN_DEBUG "PCI: CLS %u bytes\n",
pci_cache_line_size << 2);
pci_apply_fixup_final_quirks = true;
for_each_pci_dev(dev) {
pci_fixup_device(pci_fixup_final, dev);
/*
@ -3051,7 +3040,6 @@ static int __init pci_apply_final_quirks(void)
pci_cache_line_size = pci_dfl_cache_line_size;
}
}
pci_fixup_final_inited = 1;
if (!pci_cache_line_size) {
printk(KERN_DEBUG "PCI: CLS %u bytes, default %u\n",