From 710d9ce7293187d7033380e403e55152a8ce29f5 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 19 Sep 2007 15:47:59 -0700
Subject: [PATCH] --- yaml --- r: 65061 b: refs/heads/master c:
 097cc62283455668ad0b35c72920c6373f45c2ab h: refs/heads/master i:   65059:
 39747eb373e5b3d33c3c7da9e4e074cb5744a99d v: v3

---
 [refs]                         | 2 +-
 trunk/security/selinux/hooks.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4286eb6e63e3..01c7ca00abcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c95e7319ba98585ebb6d304eca2d56f401ed70c
+refs/heads/master: 097cc62283455668ad0b35c72920c6373f45c2ab
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 36946629b6ca..0753b20e23fe 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -316,6 +316,7 @@ static inline int inode_doinit(struct inode *inode)
 }
 
 enum {
+	Opt_error = -1,
 	Opt_context = 1,
 	Opt_fscontext = 2,
 	Opt_defcontext = 4,
@@ -327,6 +328,7 @@ static match_table_t tokens = {
 	{Opt_fscontext, "fscontext=%s"},
 	{Opt_defcontext, "defcontext=%s"},
 	{Opt_rootcontext, "rootcontext=%s"},
+	{Opt_error, NULL},
 };
 
 #define SEL_MOUNT_FAIL_MSG "SELinux:  duplicate or incompatible mount options\n"