diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-04 19:32:28 -0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-26 14:42:09 -0700 |
| commit | 5edb93b89f6cc3089ee283656555e7a9ad36a8a0 (patch) | |
| tree | 496964f830aa06af8351de8645ec7e19ef931264 /kernel/resource.c | |
| parent | d2e074ccbf84e91819ae07b3ca838120db2c97a9 (diff) | |
| download | lwn-5edb93b89f6cc3089ee283656555e7a9ad36a8a0.tar.gz lwn-5edb93b89f6cc3089ee283656555e7a9ad36a8a0.zip | |
resource: Add resource_contains()
We have two identical copies of resource_contains() already, and more
places that could use it. This moves it to ioport.h where it can be
shared.
resource_contains(struct resource *r1, struct resource *r2) returns true
iff r1 and r2 are the same type (most callers already checked this
separately) and the r1 address range completely contains r2.
In addition, the new resource_contains() checks that both r1 and r2 have
addresses assigned to them. If a resource is IORESOURCE_UNSET, it doesn't
have a valid address and can't contain or be contained by another resource.
Some callers already check this or for res->start.
No functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 3f285dce9347..a8344dda7049 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -432,11 +432,6 @@ static void resource_clip(struct resource *res, resource_size_t min, res->end = max; } -static bool resource_contains(struct resource *res1, struct resource *res2) -{ - return res1->start <= res2->start && res1->end >= res2->end; -} - /* * Find empty slot in the resource tree with the given range and * alignment constraints @@ -471,10 +466,11 @@ static int __find_resource(struct resource *root, struct resource *old, arch_remove_reservations(&tmp); /* Check for overflow after ALIGN() */ - avail = *new; avail.start = ALIGN(tmp.start, constraint->align); avail.end = tmp.end; + avail.flags = new->flags & ~IORESOURCE_UNSET; if (avail.start >= tmp.start) { + alloc.flags = avail.flags; alloc.start = constraint->alignf(constraint->alignf_data, &avail, size, constraint->align); alloc.end = alloc.start + size - 1; |