Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[karo-tx-linux.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 9a2d9fd7cadd2acde77a4e00615f9bbafefc8d96..9889a92d2e01773113a5c7db29975cb47d7dcb1d 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -61,7 +61,7 @@ static int proc_parse_options(char *options, struct pid_namespace *pid)
                if (!*p)
                        continue;
 
-               args[0].to = args[0].from = 0;
+               args[0].to = args[0].from = NULL;
                token = match_token(p, tokens, args);
                switch (token) {
                case Opt_gid: