diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 16:42:01 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 16:42:01 (GMT) |
| commit | e717f33e989dbe6446547d7ca97489a980056f3c (patch) | |
| tree | c9c96977c78bf3a2f9ebaeb0c49226f5ba280321 | |
| parent | 1bfd4d586057e7f608501de62bacdc82974c7cfa (diff) | |
| parent | ff8a4bae459a9b6455504127fcb78fdbc8e50e4c (diff) | |
| download | linux-fsl-qoriq-e717f33e989dbe6446547d7ca97489a980056f3c.tar.xz | |
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"
| -rw-r--r-- | 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 |