3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index dd87e86048be..c0cc4e7ff023 100644
--- a/drivers/oprofile/event_buffer.c
+++ b/drivers/oprofile/event_buffer.c
@@ -82,10 +82,10 @@ int alloc_event_buffer(void)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&oprofilefs_lock, flags);
+        raw_spin_lock_irqsave(&oprofilefs_lock, flags);
         buffer_size = oprofile_buffer_size;
         buffer_watershed = oprofile_buffer_watershed;
-        spin_unlock_irqrestore(&oprofilefs_lock, flags);
+        raw_spin_unlock_irqrestore(&oprofilefs_lock, flags);
 
         if (buffer_watershed >= buffer_size)
                 return -EINVAL;
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index 94796f39bc47..da14432806c6 100644
--- a/drivers/oprofile/oprofile_perf.c
+++ b/drivers/oprofile/oprofile_perf.c
@@ -160,9 +160,9 @@ static int oprofile_perf_create_files(struct super_block *sb, struct dentry *roo
 
 static int oprofile_perf_setup(void)
 {
-        spin_lock(&oprofilefs_lock);
+        raw_spin_lock(&oprofilefs_lock);
         op_perf_setup();
-        spin_unlock(&oprofilefs_lock);
+        raw_spin_unlock(&oprofilefs_lock);
         return 0;
 }
 
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index e9ff6f7770be..d0de6cc2d7a5 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -21,7 +21,7 @@
 
 #define OPROFILEFS_MAGIC 0x6f70726f
 
-DEFINE_SPINLOCK(oprofilefs_lock);
+DEFINE_RAW_SPINLOCK(oprofilefs_lock);
 
 static struct inode *oprofilefs_get_inode(struct super_block *sb, int mode)
 {
@@ -76,9 +76,9 @@ int oprofilefs_ulong_from_user(unsigned long *val, char const __user *buf, size_
         if (copy_from_user(tmpbuf, buf, count))
                 return -EFAULT;
 
-        spin_lock_irqsave(&oprofilefs_lock, flags);
+        raw_spin_lock_irqsave(&oprofilefs_lock, flags);
         *val = simple_strtoul(tmpbuf, NULL, 0);
-        spin_unlock_irqrestore(&oprofilefs_lock, flags);
+        raw_spin_unlock_irqrestore(&oprofilefs_lock, flags);
         return 0;
 }