From d860a0ad215965ab03fe497889fe2e1a4ede3765 Mon Sep 17 00:00:00 2001 From: John Rose Date: Tue, 15 Jun 2004 06:19:55 -0700 Subject: [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 002f0000-002fffff : PCI Bus #48 00200000-002fffff : /pci@800000020000003 Signed-off-by: John Rose Signed-off-by: Linus Torvalds --- kernel/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel') diff --git a/kernel/resource.c b/kernel/resource.c index f7a704e88bd1..da0ffd601fd7 100644 --- 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; -- cgit v1.2.3