diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:14:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:14:58 -0400 |
| commit | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (patch) | |
| tree | d4c5eba8cd2abefd7c9f16d089393f0f5999cf63 /arch/x86/pci/amd_bus.c | |
| parent | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (diff) | |
| parent | 9340e1ccdf7b9b22a2be7f51cd74e8b5e11961bf (diff) | |
Merge branch 'x86/mpparse' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_64.c
arch/x86/mm/init_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci/amd_bus.c')
| -rw-r--r-- | arch/x86/pci/amd_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index 15f505d3a78e..d02c598451ec 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c | |||
| @@ -388,7 +388,7 @@ static int __init early_fill_mp_bus_info(void) | |||
| 388 | /* need to take out [0, TOM) for RAM*/ | 388 | /* need to take out [0, TOM) for RAM*/ |
| 389 | address = MSR_K8_TOP_MEM1; | 389 | address = MSR_K8_TOP_MEM1; |
| 390 | rdmsrl(address, val); | 390 | rdmsrl(address, val); |
| 391 | end = (val & 0xffffff8000000ULL); | 391 | end = (val & 0xffffff800000ULL); |
| 392 | printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20); | 392 | printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20); |
| 393 | if (end < (1ULL<<32)) | 393 | if (end < (1ULL<<32)) |
| 394 | update_range(range, 0, end - 1); | 394 | update_range(range, 0, end - 1); |
| @@ -482,7 +482,7 @@ static int __init early_fill_mp_bus_info(void) | |||
| 482 | /* TOP_MEM2 */ | 482 | /* TOP_MEM2 */ |
| 483 | address = MSR_K8_TOP_MEM2; | 483 | address = MSR_K8_TOP_MEM2; |
| 484 | rdmsrl(address, val); | 484 | rdmsrl(address, val); |
| 485 | end = (val & 0xffffff8000000ULL); | 485 | end = (val & 0xffffff800000ULL); |
| 486 | printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20); | 486 | printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20); |
| 487 | update_range(range, 1ULL<<32, end - 1); | 487 | update_range(range, 1ULL<<32, end - 1); |
| 488 | } | 488 | } |