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

[deliverable/linux.git] / include / linux / kprobes.h

diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index dd7c12e875bcc987abea835fc96b18cd3416a0eb..dce6e4dbeda7639bc87eca49e9102a41c0f01c89 100644 (file)
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -181,7 +181,7 @@ struct kretprobe {
        int nmissed;
        size_t data_size;
        struct hlist_head free_instances;
-       spinlock_t lock;
+       raw_spinlock_t lock;
 };
 
 struct kretprobe_instance {