From e1cad1c6c6486d98f6e2b541c18fb4a7e40eabc7 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sun, 20 Dec 2009 10:50:02 +0100
Subject: [PATCH] --- yaml --- r: 178147 b: refs/heads/master c:
 0e2c8b8f55072a98b99e7bdad55c912084d6a526 h: refs/heads/master i:   178145:
 ff6b4b1474582b87f7eb563fc4f3f771631e2f56   178143:
 317b2d8197d21b92fc5b1059176928ef99255320 v: v3

---
 [refs]                  |  2 +-
 trunk/kernel/resource.c | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index b1a30328c287..53fa25334d26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7b84a6ba7eaeba4e1df8feddca1473a7db369a5
+refs/heads/master: 0e2c8b8f55072a98b99e7bdad55c912084d6a526
diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c
index dc15686b7a77..af96c1e4b54b 100644
--- a/trunk/kernel/resource.c
+++ b/trunk/kernel/resource.c
@@ -308,37 +308,37 @@ static int find_resource(struct resource *root, struct resource *new,
 			 void *alignf_data)
 {
 	struct resource *this = root->child;
-	resource_size_t start, end;
+	struct resource tmp = *new;
 
-	start = root->start;
+	tmp.start = root->start;
 	/*
 	 * Skip past an allocated resource that starts at 0, since the assignment
-	 * of this->start - 1 to new->end below would cause an underflow.
+	 * of this->start - 1 to tmp->end below would cause an underflow.
 	 */
 	if (this && this->start == 0) {
-		start = this->end + 1;
+		tmp.start = this->end + 1;
 		this = this->sibling;
 	}
 	for(;;) {
 		if (this)
-			end = this->start - 1;
+			tmp.end = this->start - 1;
 		else
-			end = root->end;
-		if (start < min)
-			start = min;
-		if (end > max)
-			end = max;
-		start = ALIGN(start, align);
+			tmp.end = root->end;
+		if (tmp.start < min)
+			tmp.start = min;
+		if (tmp.end > max)
+			tmp.end = max;
+		tmp.start = ALIGN(tmp.start, align);
 		if (alignf)
-			alignf(alignf_data, new, size, align);
-		if (start < end && end - start >= size - 1) {
-			new->start = start;
-			new->end = start + size - 1;
+			alignf(alignf_data, &tmp, size, align);
+		if (tmp.start < tmp.end && tmp.end - tmp.start >= size - 1) {
+			new->start = tmp.start;
+			new->end = tmp.start + size - 1;
 			return 0;
 		}
 		if (!this)
 			break;
-		start = this->end + 1;
+		tmp.start = this->end + 1;
 		this = this->sibling;
 	}
 	return -EBUSY;