From 521df5d6a85ab05e3b1278b4d80e8fe2b01d1d98 Mon Sep 17 00:00:00 2001
From: Huang Shijie <shijie8@gmail.com>
Date: Wed, 27 Oct 2010 15:34:52 -0700
Subject: [PATCH] --- yaml --- r: 218620 b: refs/heads/master c:
 5de1cb2d0f1c1e5475d2bedf65b76828f8cdde22 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/resource.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 123e3bd1eea9..59cdd11426a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 144ecf310eb52d9df607b9b7eeb096743e232a96
+refs/heads/master: 5de1cb2d0f1c1e5475d2bedf65b76828f8cdde22
diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c
index 7b36976e5dea..9c9841cb6902 100644
--- a/trunk/kernel/resource.c
+++ b/trunk/kernel/resource.c
@@ -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;