1 files changed, 8 insertions, 10 deletions

diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index 8f40cb47720e..fa5cac255c16 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -196,7 +196,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
                         inb(cx_address);
                         /* Dummy op - must do something useless after P_LVL3
                          * read */
-                        t = inl(acpi_fadt.xpm_tmr_blk.address);
+                        t = inl(acpi_gbl_FADT.xpm_timer_block.address);
                 }
                 longhaul.bits.EnableSoftVID = 0;
                 wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
@@ -214,7 +214,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
                 /* Invoke C3 */
                 inb(cx_address);
                 /* Dummy op - must do something useless after P_LVL3 read */
-                t = inl(acpi_fadt.xpm_tmr_blk.address);
+                t = inl(acpi_gbl_FADT.xpm_timer_block.address);
         }
         /* Disable bus ratio bit */
         longhaul.bits.EnableSoftBusRatio = 0;
@@ -234,7 +234,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
                         inb(cx_address);
                         /* Dummy op - must do something useless after P_LVL3
                          * read */
-                        t = inl(acpi_fadt.xpm_tmr_blk.address);
+                        t = inl(acpi_gbl_FADT.xpm_timer_block.address);
                 }
                 longhaul.bits.EnableSoftVID = 0;
                 wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
@@ -291,8 +291,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
                 outb(3, 0x22);
         } else if ((pr != NULL) && pr->flags.bm_control) {
                 /* Disable bus master arbitration */
-                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1,
-                                  ACPI_MTX_DO_NOT_LOCK);
+                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
         }
         switch (longhaul_version) {
 
@@ -322,8 +321,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
         case TYPE_POWERSAVER:
                 if (longhaul_flags & USE_ACPI_C3) {
                         /* Don't allow wakeup */
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
-                                          ACPI_MTX_DO_NOT_LOCK);
+                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
                         do_powersaver(cx->address, clock_ratio_index);
                 } else {
                         do_powersaver(0, clock_ratio_index);
@@ -336,8 +334,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
                 outb(0, 0x22);
         } else if ((pr != NULL) && pr->flags.bm_control) {
                 /* Enable bus master arbitration */
-                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0,
-                                  ACPI_MTX_DO_NOT_LOCK);
+                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
         }
         outb(pic2_mask,0xA1);   /* restore mask */
         outb(pic1_mask,0x21);
@@ -416,7 +413,7 @@ static int __init longhaul_get_ranges(void)
         highest_speed = calc_speed(maxmult);
         lowest_speed = calc_speed(minmult);
         dprintk ("FSB:%dMHz  Lowest speed: %s   Highest speed:%s\n", fsb,
-                 print_speed(lowest_speed/1000), 
+                 print_speed(lowest_speed/1000),
                  print_speed(highest_speed/1000));
 
         if (lowest_speed == highest_speed) {
@@ -531,6 +528,7 @@ static void __init longhaul_setup_voltagescaling(void)
         /* Calculate kHz for one voltage step */
         kHz_step = (highest_speed - min_vid_speed) / numvscales;
 
+
         j = 0;
         while (longhaul_table[j].frequency != CPUFREQ_TABLE_END) {
                 speed = longhaul_table[j].frequency;