[PATCH] x86: fix warning in e820_reserve_resources with 32bit

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Saturday, June 28, 2008 - 5:49 pm

when 64bit resource is not enabled, got:

arch/x86/kernel/e820.c: In function ‘e820_reserve_resources’:
arch/x86/kernel/e820.c:1217: warning: comparison is always false due to limited range of data type

because res->start/end is resource_t aka u32. it will overflow.

fix it with temp end of u64

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index fa77cb4..ba5ac88 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1202,6 +1202,7 @@ void __init e820_reserve_resources(void)
 {
 	int i;
 	struct resource *res;
+	u64 end;
 
 	res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map);
 	for (i = 0; i < e820.nr_map; i++) {
@@ -1211,14 +1212,16 @@ void __init e820_reserve_resources(void)
 		case E820_NVS:	res->name = "ACPI Non-volatile Storage"; break;
 		default:	res->name = "reserved";
 		}
-		res->start = e820.map[i].addr;
-		res->end = res->start + e820.map[i].size - 1;
+		end = e820.map[i].addr + e820.map[i].size - 1;
 #ifndef CONFIG_RESOURCES_64BIT
-		if (res->end > 0x100000000ULL) {
+		if (end > 0x100000000ULL) {
 			res++;
 			continue;
 		}
 #endif
+		res->start = e820.map[i].addr;
+		res->end = end;
+
 		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
 		insert_resource(&iomem_resource, res);
 		res++;
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/16] x86: merge setup_32/64.c, Yinghai Lu, (Wed Jun 25, 5:48 pm)
[PATCH 07/16] x86: space to tab in setup_arch, Yinghai Lu, (Wed Jun 25, 5:53 pm)
[PATCH 08/16] x86: rename setup_32.c to setup.c, Yinghai Lu, (Wed Jun 25, 5:54 pm)
[PATCH 09/16] x86: move boot_params back to setup.c, Yinghai Lu, (Wed Jun 25, 5:55 pm)
[PATCH] x86: clean up ARCH_SETUP, Yinghai Lu, (Wed Jun 25, 7:52 pm)
[PATCH] x86: move fix mapping page table range early, Yinghai Lu, (Wed Jun 25, 9:51 pm)
Re: [PATCH 00/16] x86: merge setup_32/64.c, Ingo Molnar, (Thu Jun 26, 2:47 am)
Re: [PATCH 00/16] x86: merge setup_32/64.c, Ingo Molnar, (Thu Jun 26, 3:02 am)
Re: [PATCH 00/16] x86: merge setup_32/64.c, Yinghai Lu, (Thu Jun 26, 3:06 am)
Re: [PATCH 00/16] x86: merge setup_32/64.c, Ingo Molnar, (Thu Jun 26, 4:01 am)
Re: [PATCH] x86: clean up ARCH_SETUP, Ingo Molnar, (Thu Jun 26, 6:26 am)
Re: [PATCH 00/16] x86: merge setup_32/64.c, Huang, Ying, (Thu Jun 26, 7:51 pm)
[PATCH] x86: early res print out alignment, Yinghai Lu, (Thu Jun 26, 11:17 pm)
[PATCH] x86: early res print out alignment v2, Yinghai Lu, (Fri Jun 27, 3:36 pm)
[PATCH] x86: fix init_memory_mapping over boundary, Yinghai Lu, (Fri Jun 27, 3:38 pm)
[PATCH] x86: fix init_memory_mapping over boundary v2, Yinghai Lu, (Fri Jun 27, 10:47 pm)
Re: [PATCH] x86: early res print out alignment v2, Ingo Molnar, (Fri Jun 27, 11:36 pm)
Re: [PATCH] x86: fix init_memory_mapping over boundary v2, Jeremy Fitzhardinge, (Sat Jun 28, 10:38 am)
[PATCH] x86: fix warning in e820_reserve_resources with 32bit, Yinghai Lu, (Sat Jun 28, 5:49 pm)
Re: [PATCH] x86: fix init_memory_mapping over boundary v4, Jeremy Fitzhardinge, (Sat Jun 28, 7:22 pm)
Re: [PATCH] x86: early res print out alignment v2, Yinghai Lu, (Sat Jun 28, 9:42 pm)
Re: [PATCH] x86: fix init_memory_mapping over boundary v4, Jeremy Fitzhardinge, (Sat Jun 28, 10:18 pm)