diff options
| author | Saurabh Misra <Saurabh.Mishra@Sun.COM> | 2009-02-11 11:45:42 -0800 |
|---|---|---|
| committer | Saurabh Misra <Saurabh.Mishra@Sun.COM> | 2009-02-11 11:45:42 -0800 |
| commit | a898d95b5e162e6e7985584118c2abfccbe9b868 (patch) | |
| tree | 92da063823a1aa5def1f0450ed02982576d3e34c /usr/src | |
| parent | 51e44b2bf5dcc3c2b05d7ee0b6dcacddcdb32aef (diff) | |
| download | illumos-joyent-a898d95b5e162e6e7985584118c2abfccbe9b868.tar.gz | |
6801372 fastboot path uses incorrect local apic ops in apic_shutdown()
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/i86pc/io/pcplusmp/apic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/i86pc/io/pcplusmp/apic.c b/usr/src/uts/i86pc/io/pcplusmp/apic.c index da1408c339..d83e2c2209 100644 --- a/usr/src/uts/i86pc/io/pcplusmp/apic.c +++ b/usr/src/uts/i86pc/io/pcplusmp/apic.c @@ -634,7 +634,8 @@ apic_init_intr() if (apic_cpus[cpun].aci_local_ver < APIC_INTEGRATED_VERS) { nlvt = 3; } else { - nlvt = ((apicadr[APIC_VERS_REG] >> 16) & 0xFF) + 1; + nlvt = ((apic_reg_ops->apic_read(APIC_VERS_REG) >> 16) & + 0xFF) + 1; } if (nlvt >= 5) { @@ -1693,8 +1694,8 @@ apic_shutdown(int cmd, int fcn) (void) AcpiDisable(); if (fcn == AD_FASTREBOOT) { - apicadr[APIC_INT_CMD1] = AV_ASSERT | AV_RESET | - AV_SH_ALL_EXCSELF; + apic_reg_ops->apic_write(APIC_INT_CMD1, + AV_ASSERT | AV_RESET | AV_SH_ALL_EXCSELF); } /* remainder of function is for shutdown+poweroff case only */ |