Merge branch 'viro'

[firefly-linux-kernel-4.4.55.git] / include / linux / attribute_container.h

diff --git a/include/linux/attribute_container.h b/include/linux/attribute_container.h
index ee83fe64a1025512aa1ad2553502bc19e618e544..93bfb0beb62a9f1903d37e266fcb22b8284cf5ec 100644 (file)
--- a/include/linux/attribute_container.h
+++ b/include/linux/attribute_container.h
@@ -11,12 +11,12 @@
 
 #include <linux/device.h>
 #include <linux/list.h>
+#include <linux/klist.h>
 #include <linux/spinlock.h>
 
 struct attribute_container {
        struct list_head        node;
-       struct list_head        containers;
-       spinlock_t              containers_lock;
+       struct klist            containers;
        struct class            *class;
        struct class_device_attribute **attrs;
        int (*match)(struct attribute_container *, struct device *);