[tip:x86/urgent] Revert "x86: cap iomem_resource to addressable physical memory"

tip-bot for H. Peter Anvin
2009-06-28T07:40:48Z

Commit-ID: ff8a4bae459a9b6455504127fcb78fdbc8e50e4c
Gitweb: http://git.kernel.org/tip/ff8a4bae459a9b6455504127fcb78fdbc8e50e4c
Author: H. Peter Anvin <hpa@zytor.com>
AuthorDate: Sat, 27 Jun 2009 12:22:27 -0700
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Sun, 28 Jun 2009 09:38:47 +0200

Revert "x86: cap iomem_resource to addressable physical memory"

This reverts commit 95ee14e4379c5e19c0897c872350570402014742.
Mikael Petterson <mikepe@it.uu.se> reported that at least one of his
systems will not boot as a result. We have ruled out the detection
algorithm malfunctioning, so it is not a matter of producing the
incorrect bitmasks; rather, something in the application of them
fails.

Revert the commit until we can root cause and correct this problem.

-stable team: this means the underlying commit should be rejected.

Reported-and-isolated-by: Mikael Petterson <mikpe@it.uu.se>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
LKML-Reference: <200906261559.n5QFxJH8027336@pilspetsen.it.uu.se>
Cc: stable@kernel.org
Cc: Grant Grundler <grundler@parisc-linux.org>

---
arch/x86/kernel/cpu/common.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 6b26d4d..f1961c0 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -848,9 +848,6 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)
numa_add_cpu(smp_processor_id());
#endif
-
- /* Cap the iomem address space to what is addressable on all CPUs */
- iomem_resource.end &= (1ULL << c->x86_phys_bits) - 1;
}

#ifdef CONFIG_X86_64