Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218620
b: refs/heads/master
c: 5de1cb2
h: refs/heads/master
v: v3
  • Loading branch information
Huang Shijie authored and Linus Torvalds committed Oct 28, 2010
1 parent 89333fe commit 521df5d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 144ecf310eb52d9df607b9b7eeb096743e232a96
refs/heads/master: 5de1cb2d0f1c1e5475d2bedf65b76828f8cdde22
2 changes: 2 additions & 0 deletions trunk/kernel/resource.c
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,8 @@ static struct resource * __insert_resource(struct resource *parent, struct resou

if (first == parent)
return first;
if (WARN_ON(first == new)) /* duplicated insertion */
return first;

if ((first->start > new->start) || (first->end < new->end))
break;
Expand Down

0 comments on commit 521df5d

Please sign in to comment.