Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / drivers / idle / i7300_idle.c

diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c
index fa080ebd568f83fcaf821a7650e31983e8221300..ffeebc7e9f1c0f11476f9e37510b2683566a8158 100644 (file)
--- a/drivers/idle/i7300_idle.c
+++ b/drivers/idle/i7300_idle.c
@@ -75,7 +75,7 @@ static unsigned long past_skip;
 
 static struct pci_dev *fbd_dev;
 
-static spinlock_t i7300_idle_lock;
+static raw_spinlock_t i7300_idle_lock;
 static int i7300_idle_active;
 
 static u8 i7300_idle_thrtctl_saved;
@@ -457,7 +457,7 @@ static int i7300_idle_notifier(struct notifier_block *nb, unsigned long val,
                idle_begin_time = ktime_get();
        }
 
-       spin_lock_irqsave(&i7300_idle_lock, flags);
+       raw_spin_lock_irqsave(&i7300_idle_lock, flags);
        if (val == IDLE_START) {
 
                cpumask_set_cpu(smp_processor_id(), idle_cpumask);
@@ -506,7 +506,7 @@ static int i7300_idle_notifier(struct notifier_block *nb, unsigned long val,
                }
        }
 end:
-       spin_unlock_irqrestore(&i7300_idle_lock, flags);
+       raw_spin_unlock_irqrestore(&i7300_idle_lock, flags);
        return 0;
 }
 
@@ -548,7 +548,7 @@ struct debugfs_file_info {
 
 static int __init i7300_idle_init(void)
 {
-       spin_lock_init(&i7300_idle_lock);
+       raw_spin_lock_init(&i7300_idle_lock);
        total_us = 0;
 
        if (i7300_idle_platform_probe(&fbd_dev, &ioat_dev, forceload))