public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yinghai Lu <yhlu.kernel@gmail.com>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86: fix warning in e820_reserve_resources with 32bit
Date: Sat, 28 Jun 2008 17:49:59 -0700	[thread overview]
Message-ID: <200806281749.59443.yhlu.kernel@gmail.com> (raw)
In-Reply-To: <200806272247.11971.yhlu.kernel@gmail.com>


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++;

  parent reply	other threads:[~2008-06-29  0:48 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-26  0:48 [PATCH 00/16] x86: merge setup_32/64.c Yinghai Lu
2008-06-26  0:49 ` [PATCH 03/16] x86: update reserve_initrd to support 64bit Yinghai Lu
2008-06-26  0:50 ` [PATCH 04/16] x86: put global variable for 32bit all together Yinghai Lu
2008-06-26  0:51 ` [PATCH 05/16] x86: add extra includes for 64bit support Yinghai Lu
2008-06-26  0:52 ` [PATCH 06/16] x86: merge 64bit setup_arch into setup_32 Yinghai Lu
2008-06-26  0:53 ` [PATCH 07/16] x86: space to tab in setup_arch Yinghai Lu
2008-06-26  0:54 ` [PATCH 08/16] x86: rename setup_32.c to setup.c Yinghai Lu
2008-06-26  0:55 ` [PATCH 09/16] x86: move boot_params back " Yinghai Lu
2008-06-26  0:56 ` [PATCH 10/16] x86: move parse_setup_data " Yinghai Lu
2008-06-26  0:57 ` [PATCH 11/16] x86: move back crashkernel " Yinghai Lu
2008-06-26  0:58 ` [PATCH 12/16] x86: move reserve_standard_io_resources " Yinghai Lu
2008-06-26  0:58 ` [PATCH 13/16] x86: move parse elfvorehdr " Yinghai Lu
2008-06-26  0:59 ` [PATCH 14/16] x86: make x86_find_smp_config depends on 64 bit too Yinghai Lu
2008-06-26  1:00 ` [PATCH 15/16] x86: change some functions in setup.c to static Yinghai Lu
2008-06-26  1:02 ` [PATCH 16/16] x86: we only have init_pg_tables_end for 32bit Yinghai Lu
2008-06-26  2:52 ` [PATCH] x86: clean up ARCH_SETUP Yinghai Lu
2008-06-26 13:26   ` Ingo Molnar
2008-06-26  4:51 ` [PATCH] x86: move fix mapping page table range early Yinghai Lu
2008-06-26 13:27   ` Ingo Molnar
2008-06-27  6:17   ` [PATCH] x86: early res print out alignment Yinghai Lu
2008-06-27  8:41     ` [PATCH] x86: let setup_arch call init_apic_mappings for 32bit Yinghai Lu
2008-06-28  6:37       ` Ingo Molnar
2008-06-27 22:36     ` [PATCH] x86: early res print out alignment v2 Yinghai Lu
2008-06-28  6:36       ` Ingo Molnar
2008-06-29  4:42         ` Yinghai Lu
2008-06-27 22:38   ` [PATCH] x86: fix init_memory_mapping over boundary Yinghai Lu
2008-06-28  5:47     ` [PATCH] x86: fix init_memory_mapping over boundary v2 Yinghai Lu
2008-06-28  6:35       ` Ingo Molnar
2008-06-28  7:01         ` Yinghai Lu
2008-06-28  7:02         ` Ingo Molnar
2008-06-28  7:19           ` Yinghai Lu
2008-06-28  7:21             ` Ingo Molnar
2008-06-28  7:42               ` Yinghai Lu
2008-06-28  7:22           ` Yinghai Lu
2008-06-28  7:47             ` Ingo Molnar
2008-06-28 10:30               ` Yinghai Lu
2008-06-28 11:07                 ` Ingo Molnar
2008-06-28 17:38       ` Jeremy Fitzhardinge
2008-06-28 20:33         ` Yinghai Lu
2008-06-29  0:49       ` [PATCH] x86: fix init_memory_mapping over boundary v4 Yinghai Lu
2008-06-29  2:22         ` Jeremy Fitzhardinge
2008-06-29  4:40           ` Yinghai Lu
2008-06-29  5:18             ` Jeremy Fitzhardinge
2008-06-29  7:08         ` Ingo Molnar
2008-06-29  7:30           ` Yinghai Lu
2008-06-30  8:33             ` Ingo Molnar
2008-06-29  7:39         ` [PATCH] x86: fix init_memory_mapping over boundary v4 - diff to v3 Yinghai Lu
2008-06-29  9:48           ` Ingo Molnar
2008-06-29  0:49       ` Yinghai Lu [this message]
2008-06-29  9:49         ` [PATCH] x86: fix warning in e820_reserve_resources with 32bit Ingo Molnar
2008-06-26  9:47 ` [PATCH 00/16] x86: merge setup_32/64.c Ingo Molnar
2008-06-26 10:02   ` Ingo Molnar
2008-06-26 10:06     ` Yinghai Lu
2008-06-26 11:01       ` Ingo Molnar
2008-06-27  2:51         ` Huang, Ying

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200806281749.59443.yhlu.kernel@gmail.com \
    --to=yhlu.kernel@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox