diff options
author | Dave Airlie <airlied@redhat.com> | 2011-10-18 09:54:30 (GMT) |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 09:54:30 (GMT) |
commit | 017ed8012e74ca15748863f45d2c078453026a0a (patch) | |
tree | 7071171a06de4e93fc890e0afce5c23596a26619 /kernel/resource.c | |
parent | 80d9b24a658c83602aea66e45e2347c5bb3cbd47 (diff) | |
parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) | |
download | linux-fsl-qoriq-017ed8012e74ca15748863f45d2c078453026a0a.tar.xz |
Merge tag 'v3.1-rc10' into drm-core-next
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
Diffstat (limited to 'kernel/resource.c')
-rw-r--r-- | kernel/resource.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 3b3cedc..c8dc249 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -419,6 +419,9 @@ static int __find_resource(struct resource *root, struct resource *old, else tmp.end = root->end; + if (tmp.end < tmp.start) + goto next; + resource_clip(&tmp, constraint->min, constraint->max); arch_remove_reservations(&tmp); @@ -436,8 +439,10 @@ static int __find_resource(struct resource *root, struct resource *old, return 0; } } - if (!this) + +next: if (!this || this->end == root->end) break; + if (this != old) tmp.start = this->end + 1; this = this->sibling; |