瀏覽代碼

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"
Linus Torvalds 16 年之前
父節點
當前提交
e717f33e98
共有 1 個文件被更改,包括 0 次插入3 次删除
  1. 0 3
      arch/x86/kernel/cpu/common.c

+ 0 - 3
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)
 #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