Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc

[linux-block.git] / drivers / oprofile / oprofile_perf.c

diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index 94796f39bc47caafcb5771ba693b64e9691880ad..da14432806c6e1662e536c2c18c21763094a5329 100644 (file)
--- 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;
 }