[PATCH -v11 18/30] resources: Replace registered resource in tree.

[Yinghai Lu <yinghai@kernel.org>]

We could have one resource inserted in tree at first during proble.

Later we need to put real resource into the tree.

So try to hold the lock to swap them.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
 include/linux/ioport.h |    1 +
 kernel/resource.c      |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 20a30df..62af212 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -163,6 +163,7 @@ int probe_resource(struct resource *b_res,
 			struct device *dev, struct resource *busn_res,
 			resource_size_t needed_size, struct resource **p,
 			int skip_nr, int limit, char *name);
+void resource_replace(struct resource *old_res, struct resource *new_res);
 struct resource *lookup_resource(struct resource *root, resource_size_t start);
 int adjust_resource(struct resource *res, resource_size_t start,
 		    resource_size_t size);
diff --git a/kernel/resource.c b/kernel/resource.c
index 0c9616f..ea96dcf 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1112,6 +1112,21 @@ reduce_needed_size:
 	return ret;
 }
 
+/* replace old with new in the resource tree */
+void resource_replace(struct resource *old, struct resource *new)
+{
+	struct resource *parent;
+
+	write_lock(&resource_lock);
+	parent = old->parent;
+	new->start = old->start;
+	new->end = old->end;
+	new->flags = old->flags;
+	__release_resource(old);
+	__request_resource(parent, new);
+	write_unlock(&resource_lock);
+}
+
 /*
  * Managed region resource
  */
-- 
1.7.7