From: Andrew Morton "ACPICA: Remove obsolete Flags parameter." broke cpufreq. Cc: Robert Moore Cc: "Brown, Len" Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/cpufreq/longhaul.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff -puN arch/i386/kernel/cpu/cpufreq/longhaul.c~git-acpi-cpufreq-fix arch/i386/kernel/cpu/cpufreq/longhaul.c --- a/arch/i386/kernel/cpu/cpufreq/longhaul.c~git-acpi-cpufreq-fix +++ a/arch/i386/kernel/cpu/cpufreq/longhaul.c @@ -245,8 +245,7 @@ static void longhaul_setstate(unsigned i if (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); } else if (port22_en) { /* Disable AGP and PCI arbiters */ outb(3, 0x22); @@ -279,16 +278,14 @@ static void longhaul_setstate(unsigned i */ case TYPE_POWERSAVER: /* 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); break; } if (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); } else if (port22_en) { /* Enable arbiters */ outb(0, 0x22); _