diff --git a/[refs] b/[refs] index 451f8083b50f..9a6f51fb3d28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30a713180b3d08fdec5ca572e5a1cd35253c5d8e +refs/heads/master: 1c47cd638e8302bc38be1f6d81067950e038ebd3 diff --git a/trunk/arch/x86/kernel/cpu/amd_64.c b/trunk/arch/x86/kernel/cpu/amd_64.c index 1746f6f95726..c815c2c0484b 100644 --- a/trunk/arch/x86/kernel/cpu/amd_64.c +++ b/trunk/arch/x86/kernel/cpu/amd_64.c @@ -229,7 +229,8 @@ void __cpuinit init_amd(struct cpuinfo_x86 *c) * benefit in doing so. */ if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &tseg) && - (tseg >> PMD_SHIFT) < (max_pfn_mapped >> (PMD_SHIFT-PAGE_SHIFT))) + (tseg >> PMD_SHIFT) < + (max_pfn_mapped >> (PMD_SHIFT-PAGE_SHIFT))) set_memory_4k((unsigned long)__va(tseg), 1); } }