diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 18:49:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 12:23:59 -0400 |
commit | cf7c712c11fb881842534efe98a07f36f1c86c65 (patch) | |
tree | ff300bef11d0dd251aba9038d1b750c84edf4237 | |
parent | e29419fffceb8ec36def3c922040e1ca7bcd3de5 (diff) |
[PATCH] 64bit resource: introduce resource_size_t for the start and end of struct resource
But do not change it from what it currently is (unsigned long)
Based on a patch series originally from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | include/linux/ioport.h | 4 | ||||
-rw-r--r-- | include/linux/types.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index cd6bd001ba4e..535bd9585897 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
@@ -9,13 +9,15 @@ | |||
9 | #define _LINUX_IOPORT_H | 9 | #define _LINUX_IOPORT_H |
10 | 10 | ||
11 | #include <linux/compiler.h> | 11 | #include <linux/compiler.h> |
12 | #include <linux/types.h> | ||
12 | /* | 13 | /* |
13 | * Resources are tree-like, allowing | 14 | * Resources are tree-like, allowing |
14 | * nesting etc.. | 15 | * nesting etc.. |
15 | */ | 16 | */ |
16 | struct resource { | 17 | struct resource { |
18 | resource_size_t start; | ||
19 | resource_size_t end; | ||
17 | const char *name; | 20 | const char *name; |
18 | unsigned long start, end; | ||
19 | unsigned long flags; | 21 | unsigned long flags; |
20 | struct resource *parent, *sibling, *child; | 22 | struct resource *parent, *sibling, *child; |
21 | }; | 23 | }; |
diff --git a/include/linux/types.h b/include/linux/types.h index a5e46e783ffa..a021e1577336 100644 --- a/include/linux/types.h +++ b/include/linux/types.h | |||
@@ -177,6 +177,8 @@ typedef __u64 __bitwise __be64; | |||
177 | 177 | ||
178 | #ifdef __KERNEL__ | 178 | #ifdef __KERNEL__ |
179 | typedef unsigned __bitwise__ gfp_t; | 179 | typedef unsigned __bitwise__ gfp_t; |
180 | |||
181 | typedef unsigned long resource_size_t; | ||
180 | #endif | 182 | #endif |
181 | 183 | ||
182 | struct ustat { | 184 | struct ustat { |