X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fresource.c;h=26967e0422014a5957f4b01bbed9a4cea40098bf;hb=54d5d42404e7705cf3804593189e963350d470e5;hp=35c99ac02c7cf1408e03cfa4198a0a6786b3ac58;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=linux-2.6

diff --git a/kernel/resource.c b/kernel/resource.c
index 35c99ac02c..26967e0422 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -263,10 +263,10 @@ static int find_resource(struct resource *root, struct resource *new,
 			new->start = min;
 		if (new->end > max)
 			new->end = max;
-		new->start = (new->start + align - 1) & ~(align - 1);
+		new->start = ALIGN(new->start, align);
 		if (alignf)
 			alignf(alignf_data, new, size, align);
-		if (new->start < new->end && new->end - new->start + 1 >= size) {
+		if (new->start < new->end && new->end - new->start >= size - 1) {
 			new->end = new->start + size - 1;
 			return 0;
 		}