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

[karo-tx-linux.git] / include / linux / eventpoll.h

diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index f1e1d3c471250bf67d7b50d8e7fd62240c4deef1..f6856a5a1d4bfded1dd4deff2828b6c9082815b8 100644 (file)
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -61,7 +61,6 @@ struct file;
 static inline void eventpoll_init_file(struct file *file)
 {
        INIT_LIST_HEAD(&file->f_ep_links);
-       spin_lock_init(&file->f_ep_lock);
 }