From: Andrew Morton Cc: Yinghai Lu Cc: Yinghai Lu Signed-off-by: Andrew Morton --- arch/x86_64/kernel/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN arch/x86_64/kernel/setup.c~x86_64-check-and-enable-mmconfig-for-amd-family-10h-opteron-fix arch/x86_64/kernel/setup.c --- a/arch/x86_64/kernel/setup.c~x86_64-check-and-enable-mmconfig-for-amd-family-10h-opteron-fix +++ a/arch/x86_64/kernel/setup.c @@ -492,7 +492,7 @@ static int nearby_node(int apicid) /*[39:8] */ /* why not using 0xfe000000 ? */ #define FAM10H_PCI_MMIO_BASE 0xc0000000 -static void fam10h_check_enable_mmcfg(struct cpuinfo_x86 *c) +static void __cpuinit fam10h_check_enable_mmcfg(struct cpuinfo_x86 *c) { u32 low, high, address; @@ -505,8 +505,8 @@ static void fam10h_check_enable_mmcfg(st printk(KERN_INFO "Enable MMCONFIG on AMD Family 10h\n"); /* - * if it is not enable, let enable it and assume only one segement - * with 256 buses + * If it is not enabled, enable it and assume only one segment + * with 256 busses. */ low &= ~(0xfff00000 | (0xf<<2)); low |= (8<<2) | (1<<0); _