Subject: acpi: don't do local_irq_enable() in hard IRQ From: Andrew Morton Reported-by: Cc: Rusty Russell Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Rusty Russell --- drivers/acpi/processor_throttling.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff -puN drivers/acpi/processor_throttling.c~misc-work_on_cpu-acpi-dont-do-local_irq_enable-in-hard-irq drivers/acpi/processor_throttling.c --- a/drivers/acpi/processor_throttling.c~misc-work_on_cpu-acpi-dont-do-local_irq_enable-in-hard-irq +++ a/drivers/acpi/processor_throttling.c @@ -616,6 +616,8 @@ static int acpi_processor_get_throttling u32 duty_mask = 0; u32 duty_value = 0; + WARN_ON_ONCE(!irqs_disabled()); + if (!pr) return -EINVAL; @@ -628,8 +630,6 @@ static int acpi_processor_get_throttling duty_mask <<= pr->throttling.duty_offset; - local_irq_disable(); - value = inl(pr->throttling.address); /* @@ -646,8 +646,6 @@ static int acpi_processor_get_throttling pr->throttling.state = state; - local_irq_enable(); - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Throttling state is T%d (%d%% throttling applied)\n", state, pr->throttling.states[state].performance)); @@ -919,6 +917,8 @@ static int acpi_processor_set_throttling u32 duty_mask = 0; u32 duty_value = 0; + WARN_ON_ONCE(!irqs_disabled()); + if (!pr) return -EINVAL; @@ -948,8 +948,6 @@ static int acpi_processor_set_throttling duty_mask = ~duty_mask; } - local_irq_disable(); - /* * Disable throttling by writing a 0 to bit 4. Note that we must * turn it off before you can change the duty_value. @@ -975,8 +973,6 @@ static int acpi_processor_set_throttling pr->throttling.state = state; - local_irq_enable(); - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Throttling state set to T%d (%d%%)\n", state, (pr->throttling.states[state].performance ? pr->