Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

[cascardo/linux.git] / drivers / oprofile / event_buffer.c

diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index dd87e86..c0cc4e7 100644 (file)
--- 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;