From 0c77a1c9f44d59907c703b8d94fd01c0a08103c1 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Tue, 29 Jul 2008 22:32:57 -0700
Subject: [PATCH] --- yaml --- r: 106993 b: refs/heads/master c:
 1a4e564b7db999fbe5d88318c96ac8747699d417 h: refs/heads/master i:   106991:
 2b372cbbb70d62d081c849962ed5b06c600c8a7d v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/ioport.h | 4 ++++
 trunk/kernel/resource.c      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aea28da3bdb2..a5088315e045 100644
--- 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
index 2cd07cc29687..22d2115458c6 100644
--- 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
index 74af2d7cb5a1..f5b518eabefe 100644
--- 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: