---

yaml --- r: 106993 b: refs/heads/master c: 1a4e564 h: refs/heads/master i: 106991: 2b372cb v: v3
git-mirror · Jul 30, 2008 · 0c77a1c · 0c77a1c
1 parent d70ab93
commit 0c77a1c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e958d3ace7791f33518f0259cd3cf229408b135c
+refs/heads/master: 1a4e564b7db999fbe5d88318c96ac8747699d417
diff --git a/trunk/include/linux/ioport.h b/trunk/include/linux/ioport.h
@@ -118,6 +118,10 @@ extern int allocate_resource(struct resource *root, struct resource *new,
 int adjust_resource(struct resource *res, resource_size_t start,
 		    resource_size_t size);
 resource_size_t resource_alignment(struct resource *res);
+static inline resource_size_t resource_size(struct resource *res)
+{
+	return res->end - res->start + 1;
+}
 
 /* Convenience shorthand with allocation */
 #define request_region(start,n,name)	__request_region(&ioport_resource, (start), (n), (name))

diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c
@@ -490,7 +490,7 @@ resource_size_t resource_alignment(struct resource *res)
 {
 	switch (res->flags & (IORESOURCE_SIZEALIGN | IORESOURCE_STARTALIGN)) {
 	case IORESOURCE_SIZEALIGN:
-		return res->end - res->start + 1;
+		return resource_size(res);
 	case IORESOURCE_STARTALIGN:
 		return res->start;
 	default: