mirror of
https://github.com/torvalds/linux.git
synced 2026-09-23 22:14:03 +02:00
Merge branch 'pci/resource'
- Add hotplug reservation only once (not at each level of the hierarchy) so bridge windows don't grow more than necessary (Ilpo Järvinen) * pci/resource: PCI: Do not add hotplug reservation multiple times
This commit is contained in:
commit
adea2f75b7
|
|
@ -1021,7 +1021,7 @@ static resource_size_t calculate_memsize(resource_size_t size,
|
|||
resource_size_t children_add_size,
|
||||
resource_size_t align)
|
||||
{
|
||||
size = max(size, min_size) + children_add_size;
|
||||
size = max(size + children_add_size, min_size);
|
||||
return ALIGN(size, align);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user