Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'pci/resource' into next

* pci/resource:
  PCI: Add missing MEM_64 mask in pci_assign_unassigned_bridge_resources()
Bjorn Helgaas 11 years ago
parent
359c660e99 d61b0e87d2
commit
5d85142b9e
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/pci/setup-bus.c

+ 1 - 1
drivers/pci/setup-bus.c
View File 

@@ -1652,7 +1652,7 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
 
 	struct pci_dev_resource *fail_res;
 
 	int retval;
 
 	unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
 
-				  IORESOURCE_PREFETCH;
 
+				  IORESOURCE_PREFETCH | IORESOURCE_MEM_64;
 
 
 again:
 
 	__pci_bus_size_bridges(parent, &add_list);