| From b4e03db2f4b2318144b917786cdee81575cf525c Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jul 2009 18:14:37 +0200 |
| Subject: [PATCH] ACPI: Convert c3_lock to raw_spinlock |
| |
| commit 50fee3b3ad7cd773f0b50739bb0ed9ac43561c7d in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c |
| index cc978a8..3e047b8 100644 |
| --- a/drivers/acpi/processor_idle.c |
| +++ b/drivers/acpi/processor_idle.c |
| @@ -927,7 +927,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, |
| } |
| |
| static int c3_cpu_count; |
| -static DEFINE_SPINLOCK(c3_lock); |
| +static DEFINE_RAW_SPINLOCK(c3_lock); |
| |
| /** |
| * acpi_idle_enter_bm - enters C3 with proper BM handling |
| @@ -1004,12 +1004,12 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, |
| * without doing anything. |
| */ |
| if (pr->flags.bm_check && pr->flags.bm_control) { |
| - spin_lock(&c3_lock); |
| + raw_spin_lock(&c3_lock); |
| c3_cpu_count++; |
| /* Disable bus master arbitration when all CPUs are in C3 */ |
| if (c3_cpu_count == num_online_cpus()) |
| acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1); |
| - spin_unlock(&c3_lock); |
| + raw_spin_unlock(&c3_lock); |
| } else if (!pr->flags.bm_check) { |
| ACPI_FLUSH_CPU_CACHE(); |
| } |
| @@ -1018,10 +1018,10 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, |
| |
| /* Re-enable bus master arbitration */ |
| if (pr->flags.bm_check && pr->flags.bm_control) { |
| - spin_lock(&c3_lock); |
| + raw_spin_lock(&c3_lock); |
| acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0); |
| c3_cpu_count--; |
| - spin_unlock(&c3_lock); |
| + raw_spin_unlock(&c3_lock); |
| } |
| kt2 = ktime_get_real(); |
| idle_time = ktime_to_us(ktime_sub(kt2, kt1)); |
| -- |
| 1.7.1.1 |
| |