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"
This commit is contained in:
@@ -848,9 +848,6 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
|
|||||||
#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)
|
#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)
|
||||||
numa_add_cpu(smp_processor_id());
|
numa_add_cpu(smp_processor_id());
|
||||||
#endif
|
#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
|
#ifdef CONFIG_X86_64
|
||||||
|
Reference in New Issue
Block a user