29c29
< __FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_cpu.c 166184 2007-01-23 07:20:44Z njl $");
---
> __FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_cpu.c 167814 2007-03-22 18:16:43Z jkim $");
278,279c278,279
< cpu_smi_cmd = AcpiGbl_FADT->SmiCmd;
< cpu_cst_cnt = AcpiGbl_FADT->CstCnt;
---
> cpu_smi_cmd = AcpiGbl_FADT.SmiCommand;
> cpu_cst_cnt = AcpiGbl_FADT.CstControl;
313c313
< AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cpu_startup, NULL);
---
> AcpiOsExecute(OSL_NOTIFY_HANDLER, acpi_cpu_startup, NULL);
521,523c521,523
< gas.AddressSpaceId = ACPI_ADR_SPACE_SYSTEM_IO;
< gas.RegisterBitWidth = 8;
< if (AcpiGbl_FADT->Plvl2Lat <= 100) {
---
> gas.SpaceId = ACPI_ADR_SPACE_SYSTEM_IO;
> gas.BitWidth = 8;
> if (AcpiGbl_FADT.C2Latency <= 100) {
530c530
< cx_ptr->trans_lat = AcpiGbl_FADT->Plvl2Lat;
---
> cx_ptr->trans_lat = AcpiGbl_FADT.C2Latency;
539c539
< if (AcpiGbl_FADT->Plvl3Lat <= 1000) {
---
> if (AcpiGbl_FADT.C3Latency <= 1000) {
546c546
< cx_ptr->trans_lat = AcpiGbl_FADT->Plvl3Lat;
---
> cx_ptr->trans_lat = AcpiGbl_FADT.C3Latency;
866,867c866
< AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active,
< ACPI_MTX_DO_NOT_LOCK);
---
> AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active);
869,870c868
< AcpiSetRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1,
< ACPI_MTX_DO_NOT_LOCK);
---
> AcpiSetRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1);
897,899c895,896
< AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK);
< AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1,
< ACPI_MTX_DO_NOT_LOCK);
---
> AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1);
> AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1);
910c907
< AcpiHwLowLevelRead(32, &start_time, &AcpiGbl_FADT->XPmTmrBlk);
---
> AcpiHwLowLevelRead(32, &start_time, &AcpiGbl_FADT.XPmTimerBlock);
919,920c916,917
< AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT->XPmTmrBlk);
< AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT->XPmTmrBlk);
---
> AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT.XPmTimerBlock);
> AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT.XPmTimerBlock);
925,926c922,923
< AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 0, ACPI_MTX_DO_NOT_LOCK);
< AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0, ACPI_MTX_DO_NOT_LOCK);
---
> AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 0);
> AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0);
965,966c962,965
< if (AcpiGbl_FADT->V1_Pm2CntBlk == 0 || AcpiGbl_FADT->Pm2CntLen == 0) {
< if (AcpiGbl_FADT->WbInvd && AcpiGbl_FADT->WbInvdFlush == 0) {
---
> if (AcpiGbl_FADT.Pm2ControlBlock == 0 ||
> AcpiGbl_FADT.Pm2ControlLength == 0) {
> if ((AcpiGbl_FADT.Flags & ACPI_FADT_WBINVD) &&
> (AcpiGbl_FADT.Flags & ACPI_FADT_WBINVD_FLUSH) == 0) {