diff options
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 32 | 
1 files changed, 16 insertions, 16 deletions
| diff --git a/kernel/resource.c b/kernel/resource.c index dc15686b7a77..af96c1e4b54b 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
| @@ -308,37 +308,37 @@ static int find_resource(struct resource *root, struct resource *new, | |||
| 308 | void *alignf_data) | 308 | void *alignf_data) | 
| 309 | { | 309 | { | 
| 310 | struct resource *this = root->child; | 310 | struct resource *this = root->child; | 
| 311 | resource_size_t start, end; | 311 | struct resource tmp = *new; | 
| 312 | 312 | ||
| 313 | start = root->start; | 313 | tmp.start = root->start; | 
| 314 | /* | 314 | /* | 
| 315 | * Skip past an allocated resource that starts at 0, since the assignment | 315 | * Skip past an allocated resource that starts at 0, since the assignment | 
| 316 | * of this->start - 1 to new->end below would cause an underflow. | 316 | * of this->start - 1 to tmp->end below would cause an underflow. | 
| 317 | */ | 317 | */ | 
| 318 | if (this && this->start == 0) { | 318 | if (this && this->start == 0) { | 
| 319 | start = this->end + 1; | 319 | tmp.start = this->end + 1; | 
| 320 | this = this->sibling; | 320 | this = this->sibling; | 
| 321 | } | 321 | } | 
| 322 | for(;;) { | 322 | for(;;) { | 
| 323 | if (this) | 323 | if (this) | 
| 324 | end = this->start - 1; | 324 | tmp.end = this->start - 1; | 
| 325 | else | 325 | else | 
| 326 | end = root->end; | 326 | tmp.end = root->end; | 
| 327 | if (start < min) | 327 | if (tmp.start < min) | 
| 328 | start = min; | 328 | tmp.start = min; | 
| 329 | if (end > max) | 329 | if (tmp.end > max) | 
| 330 | end = max; | 330 | tmp.end = max; | 
| 331 | start = ALIGN(start, align); | 331 | tmp.start = ALIGN(tmp.start, align); | 
| 332 | if (alignf) | 332 | if (alignf) | 
| 333 | alignf(alignf_data, new, size, align); | 333 | alignf(alignf_data, &tmp, size, align); | 
| 334 | if (start < end && end - start >= size - 1) { | 334 | if (tmp.start < tmp.end && tmp.end - tmp.start >= size - 1) { | 
| 335 | new->start = start; | 335 | new->start = tmp.start; | 
| 336 | new->end = start + size - 1; | 336 | new->end = tmp.start + size - 1; | 
| 337 | return 0; | 337 | return 0; | 
| 338 | } | 338 | } | 
| 339 | if (!this) | 339 | if (!this) | 
| 340 | break; | 340 | break; | 
| 341 | start = this->end + 1; | 341 | tmp.start = this->end + 1; | 
| 342 | this = this->sibling; | 342 | this = this->sibling; | 
| 343 | } | 343 | } | 
| 344 | return -EBUSY; | 344 | return -EBUSY; | 
