aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/e820.c
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-09-11 04:31:50 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-14 11:24:27 -0400
commit8308c54d7e312f7a03e2ce2057d0837e6fe3843f (patch)
tree452b32a3d2182c4d150d632f243e31f16b2ac0ce /arch/x86/kernel/e820.c
parent947d0496cf3e12ebfa70b3eaf561c25403247ce9 (diff)
generic: redefine resource_size_t as phys_addr_t
There's no good reason why a resource_size_t shouldn't just be a physical address, so simply redefine it in terms of phys_addr_t. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/e820.c')
-rw-r--r--arch/x86/kernel/e820.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 66e48aa2dd1b..477f4bb7e552 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1276,12 +1276,10 @@ void __init e820_reserve_resources(void)
1276 res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map); 1276 res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map);
1277 for (i = 0; i < e820.nr_map; i++) { 1277 for (i = 0; i < e820.nr_map; i++) {
1278 end = e820.map[i].addr + e820.map[i].size - 1; 1278 end = e820.map[i].addr + e820.map[i].size - 1;
1279#ifndef CONFIG_RESOURCES_64BIT 1279 if (end != (resource_size_t)end) {
1280 if (end > 0x100000000ULL) {
1281 res++; 1280 res++;
1282 continue; 1281 continue;
1283 } 1282 }
1284#endif
1285 res->name = e820_type_to_string(e820.map[i].type); 1283 res->name = e820_type_to_string(e820.map[i].type);
1286 res->start = e820.map[i].addr; 1284 res->start = e820.map[i].addr;
1287 res->end = end; 1285 res->end = end;