diff --git a/[refs] b/[refs]
index 1acb1a1b3584..013ea03bac40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade3ddc01e2e426cc24c744be85dcaad4e8f8aba
+refs/heads/master: 8b964eae204d791421677ec56b94a7b18cf8740d
diff --git a/trunk/security/apparmor/include/file.h b/trunk/security/apparmor/include/file.h
index ab8c6d87f758..f98fd4701d80 100644
--- a/trunk/security/apparmor/include/file.h
+++ b/trunk/security/apparmor/include/file.h
@@ -117,7 +117,7 @@ static inline u16 dfa_map_xindex(u16 mask)
 		index |= AA_X_NAME;
 	} else if (old_index == 3) {
 		index |= AA_X_NAME | AA_X_CHILD;
-	} else {
+	} else if (old_index) {
 		index |= AA_X_TABLE;
 		index |= old_index - 4;
 	}