Merge tag 'v4.9.32' into linux-4.9.x-grsecurity-3.1

[people/arne_f/kernel.git] / include / linux / cgroup-defs.h

diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 6fb1c34cf80514acd317193dd96b220ecb84ecfa..178cfcf5de0970a5b722b4e25d8c60be9916c1ac 100644 (file)
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -428,7 +428,7 @@ struct cftype {
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
        struct lock_class_key   lockdep_key;
 #endif
-};
+} __do_const;
 
 /*
  * Control Group subsystem type.