Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 178147
b: refs/heads/master
c: 0e2c8b8
h: refs/heads/master
i:
  178145: ff6b4b1
  178143: 317b2d8
v: v3
  • Loading branch information
Dominik Brodowski authored and Linus Torvalds committed Dec 21, 2009
1 parent 5acc526 commit e1cad1c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7b84a6ba7eaeba4e1df8feddca1473a7db369a5
refs/heads/master: 0e2c8b8f55072a98b99e7bdad55c912084d6a526
32 changes: 16 additions & 16 deletions trunk/kernel/resource.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,37 +308,37 @@ static int find_resource(struct resource *root, struct resource *new,
void *alignf_data)
{
struct resource *this = root->child;
resource_size_t start, end;
struct resource tmp = *new;

start = root->start;
tmp.start = root->start;
/*
* Skip past an allocated resource that starts at 0, since the assignment
* of this->start - 1 to new->end below would cause an underflow.
* of this->start - 1 to tmp->end below would cause an underflow.
*/
if (this && this->start == 0) {
start = this->end + 1;
tmp.start = this->end + 1;
this = this->sibling;
}
for(;;) {
if (this)
end = this->start - 1;
tmp.end = this->start - 1;
else
end = root->end;
if (start < min)
start = min;
if (end > max)
end = max;
start = ALIGN(start, align);
tmp.end = root->end;
if (tmp.start < min)
tmp.start = min;
if (tmp.end > max)
tmp.end = max;
tmp.start = ALIGN(tmp.start, align);
if (alignf)
alignf(alignf_data, new, size, align);
if (start < end && end - start >= size - 1) {
new->start = start;
new->end = start + size - 1;
alignf(alignf_data, &tmp, size, align);
if (tmp.start < tmp.end && tmp.end - tmp.start >= size - 1) {
new->start = tmp.start;
new->end = tmp.start + size - 1;
return 0;
}
if (!this)
break;
start = this->end + 1;
tmp.start = this->end + 1;
this = this->sibling;
}
return -EBUSY;
Expand Down

0 comments on commit e1cad1c

Please sign in to comment.