diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-23 21:16:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-23 21:16:27 -0500 |
| commit | 7b0386921db20add25afd8678ed34a9253e512fc (patch) | |
| tree | 8c6b888b76211e38e6c1c3006553dc4b2b24c75e /arch/i386/kernel | |
| parent | c5580a7ecb859c6821dd761c95fa150ec7695ae1 (diff) | |
| parent | 22fe472cb430ce45c4fb9b6d13060dd724d6dbc8 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/kernel')
| -rw-r--r-- | arch/i386/kernel/mpparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c index 0102f3d50e57..e7609abf3796 100644 --- a/arch/i386/kernel/mpparse.c +++ b/arch/i386/kernel/mpparse.c | |||
| @@ -710,7 +710,7 @@ void __init get_smp_config (void) | |||
| 710 | * Read the physical hardware table. Anything here will | 710 | * Read the physical hardware table. Anything here will |
| 711 | * override the defaults. | 711 | * override the defaults. |
| 712 | */ | 712 | */ |
| 713 | if (!smp_read_mpc((void *)mpf->mpf_physptr)) { | 713 | if (!smp_read_mpc(phys_to_virt(mpf->mpf_physptr))) { |
| 714 | smp_found_config = 0; | 714 | smp_found_config = 0; |
| 715 | printk(KERN_ERR "BIOS bug, MP table errors detected!...\n"); | 715 | printk(KERN_ERR "BIOS bug, MP table errors detected!...\n"); |
| 716 | printk(KERN_ERR "... disabling SMP support. (tell your hw vendor)\n"); | 716 | printk(KERN_ERR "... disabling SMP support. (tell your hw vendor)\n"); |