Merge branch 'linus' into x86/urgent

Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index a97c053d3a9a..18b467dbe278 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -4,7 +4,10 @@
 #include <linux/path.h>
 
 struct fs_struct {
-        atomic_t count;
+        atomic_t count; /* This usage count is used by check_unsafe_exec() for
+                         * security checking purposes - therefore it may not be
+                         * incremented, except by clone(CLONE_FS).
+                         */
         rwlock_t lock;
         int umask;
         struct path root, pwd;