From 176b59af3aeb8a759d7775cb784d61dc4f12d745 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 26 Oct 2010 15:41:49 -0600
Subject: [PATCH] --- yaml --- r: 219567 b: refs/heads/master c:
 419afdf53cca794a190014593b4778e2e9d64cf3 h: refs/heads/master i:   219565:
 97f7edfa994957a3d74fe7fca7ab496972ca8ed7   219563:
 24ac7066f2dbea3d734d9fcc9b04816d63596d29   219559:
 c95e37b057bb21a8e314502fcc38708c7ef2ae08   219551:
 47784a03a755b034423f0397e177b6a028bcc37f v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/setup.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b92512bccf56..54f9c6f5837b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc9887dc02e37bcf83f4e792aa14b07782ef54cf
+refs/heads/master: 419afdf53cca794a190014593b4778e2e9d64cf3
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index c3a4fbb2b996..922b5a1f978b 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -788,6 +788,7 @@ void __init setup_arch(char **cmdline_p)
 
 	x86_init.oem.arch_setup();
 
+	iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1;
 	setup_memory_map();
 	parse_setup_data();
 	/* update the e820_saved too */