[PATCH] insert_resource fix

I noticed that insert_resource() incorrectly handles the case of an
existing parent resource with the same ending address as a newly added
child.  This results in incorrect nesting, like the following:

	# cat /proc/ioports
	<snip>
	002f0000-002fffff : PCI Bus #48
	  00200000-002fffff : /pci@800000020000003
	</snip>

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/kernel/resource.c b/kernel/resource.c
index f7a704e88bd1be85e457cb3c6a1b1f5b1825df3d..da0ffd601fd709df97f657a102d60e4defddf2a6 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -332,8 +332,8 @@ int insert_resource(struct resource *parent, struct resource *new)
                if (next->sibling->start > new->end)
                        break;
 
-       /* existing resource overlaps end of new resource */
-       if (next->end > new->end) {
+       /* existing resource includes new resource */
+       if (next->end >= new->end) {
                parent = next;
                result = 0;
                goto begin;