Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

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

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 7ad5e406c4214ae911642b0ad104cdb7d2b45128..e9b602151caf1ae4105c4c11023431aaabea7cb4 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -319,7 +319,7 @@ struct cftype {
         * If not 0, file mode is set to this value, otherwise it will
         * be figured out automatically
         */
-       mode_t mode;
+       umode_t mode;
 
        /*
         * If non-zero, defines the maximum length of string that can