diff options
-rw-r--r-- | drivers/idle/i7300_idle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c index fa080ebd568f..ffeebc7e9f1c 100644 --- a/drivers/idle/i7300_idle.c +++ b/drivers/idle/i7300_idle.c | |||
@@ -75,7 +75,7 @@ static unsigned long past_skip; | |||
75 | 75 | ||
76 | static struct pci_dev *fbd_dev; | 76 | static struct pci_dev *fbd_dev; |
77 | 77 | ||
78 | static spinlock_t i7300_idle_lock; | 78 | static raw_spinlock_t i7300_idle_lock; |
79 | static int i7300_idle_active; | 79 | static int i7300_idle_active; |
80 | 80 | ||
81 | static u8 i7300_idle_thrtctl_saved; | 81 | static u8 i7300_idle_thrtctl_saved; |
@@ -457,7 +457,7 @@ static int i7300_idle_notifier(struct notifier_block *nb, unsigned long val, | |||
457 | idle_begin_time = ktime_get(); | 457 | idle_begin_time = ktime_get(); |
458 | } | 458 | } |
459 | 459 | ||
460 | spin_lock_irqsave(&i7300_idle_lock, flags); | 460 | raw_spin_lock_irqsave(&i7300_idle_lock, flags); |
461 | if (val == IDLE_START) { | 461 | if (val == IDLE_START) { |
462 | 462 | ||
463 | cpumask_set_cpu(smp_processor_id(), idle_cpumask); | 463 | cpumask_set_cpu(smp_processor_id(), idle_cpumask); |
@@ -506,7 +506,7 @@ static int i7300_idle_notifier(struct notifier_block *nb, unsigned long val, | |||
506 | } | 506 | } |
507 | } | 507 | } |
508 | end: | 508 | end: |
509 | spin_unlock_irqrestore(&i7300_idle_lock, flags); | 509 | raw_spin_unlock_irqrestore(&i7300_idle_lock, flags); |
510 | return 0; | 510 | return 0; |
511 | } | 511 | } |
512 | 512 | ||
@@ -548,7 +548,7 @@ struct debugfs_file_info { | |||
548 | 548 | ||
549 | static int __init i7300_idle_init(void) | 549 | static int __init i7300_idle_init(void) |
550 | { | 550 | { |
551 | spin_lock_init(&i7300_idle_lock); | 551 | raw_spin_lock_init(&i7300_idle_lock); |
552 | total_us = 0; | 552 | total_us = 0; |
553 | 553 | ||
554 | if (i7300_idle_platform_probe(&fbd_dev, &ioat_dev, forceload)) | 554 | if (i7300_idle_platform_probe(&fbd_dev, &ioat_dev, forceload)) |