diff options
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/longhaul.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/longhaul.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/longhaul.c b/arch/x86/kernel/cpu/cpufreq/longhaul.c index f1c51aea064..0bd48e65a0c 100644 --- a/arch/x86/kernel/cpu/cpufreq/longhaul.c +++ b/arch/x86/kernel/cpu/cpufreq/longhaul.c | |||
| @@ -305,7 +305,7 @@ retry_loop: | |||
| 305 | outb(3, 0x22); | 305 | outb(3, 0x22); |
| 306 | } else if ((pr != NULL) && pr->flags.bm_control) { | 306 | } else if ((pr != NULL) && pr->flags.bm_control) { |
| 307 | /* Disable bus master arbitration */ | 307 | /* Disable bus master arbitration */ |
| 308 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1); | 308 | acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1); |
| 309 | } | 309 | } |
| 310 | switch (longhaul_version) { | 310 | switch (longhaul_version) { |
| 311 | 311 | ||
| @@ -328,7 +328,7 @@ retry_loop: | |||
| 328 | case TYPE_POWERSAVER: | 328 | case TYPE_POWERSAVER: |
| 329 | if (longhaul_flags & USE_ACPI_C3) { | 329 | if (longhaul_flags & USE_ACPI_C3) { |
| 330 | /* Don't allow wakeup */ | 330 | /* Don't allow wakeup */ |
| 331 | acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0); | 331 | acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 0); |
| 332 | do_powersaver(cx->address, mults_index, dir); | 332 | do_powersaver(cx->address, mults_index, dir); |
| 333 | } else { | 333 | } else { |
| 334 | do_powersaver(0, mults_index, dir); | 334 | do_powersaver(0, mults_index, dir); |
| @@ -341,7 +341,7 @@ retry_loop: | |||
| 341 | outb(0, 0x22); | 341 | outb(0, 0x22); |
| 342 | } else if ((pr != NULL) && pr->flags.bm_control) { | 342 | } else if ((pr != NULL) && pr->flags.bm_control) { |
| 343 | /* Enable bus master arbitration */ | 343 | /* Enable bus master arbitration */ |
| 344 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); | 344 | acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0); |
| 345 | } | 345 | } |
| 346 | outb(pic2_mask, 0xA1); /* restore mask */ | 346 | outb(pic2_mask, 0xA1); /* restore mask */ |
| 347 | outb(pic1_mask, 0x21); | 347 | outb(pic1_mask, 0x21); |
