fs/proc/root.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 7c30fce037c0..b1de04f6e41b 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -38,12 +38,13 @@ static int proc_set_super(struct super_block *sb, void *data)
 }
 
 enum {
-	Opt_gid, Opt_hidepid, Opt_err,
+	Opt_gid, Opt_hidepid, Opt_uid, Opt_err,
 };
 
 static const match_table_t tokens = {
 	{Opt_hidepid, "hidepid=%u"},
 	{Opt_gid, "gid=%u"},
+	{Opt_uid, "uid=%u"},	// ignored
 	{Opt_err, NULL},
 };
 
@@ -69,6 +70,11 @@ static int proc_parse_options(char *options, struct pid_namespace *pid)
 				return 0;
 			pid->pid_gid = make_kgid(current_user_ns(), option);
 			break;
+		case Opt_uid:
+			if (match_int(&args[0], &option))
+				return 0;
+			/* ignore it */
+			break;
 		case Opt_hidepid:
 			if (match_int(&args[0], &option))
 				return 0;