summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-29 09:42:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-29 09:42:01 -0700
commite717f33e989dbe6446547d7ca97489a980056f3c (patch)
treec9c96977c78bf3a2f9ebaeb0c49226f5ba280321 /arch
parent1bfd4d586057e7f608501de62bacdc82974c7cfa (diff)
parentff8a4bae459a9b6455504127fcb78fdbc8e50e4c (diff)
downloadlinux-e717f33e989dbe6446547d7ca97489a980056f3c.tar.bz2
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: Revert "x86: cap iomem_resource to addressable physical memory"
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/common.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 6b26d4deada0..f1961c07af9a 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