diff --git a/[refs] b/[refs]
index ea3f77b7f170..bc6ebbc62c9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e641743f055f075ed9a4edd75f1fb1e05669ddc
+refs/heads/master: 459c19f524a9d89c65717a7d061d5f11ecf6bcb8
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 520f82ab3fbf..8dbc54cde59e 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -702,7 +702,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
 		sbsec->proc = 1;
 
 	/* Determine the labeling behavior to use for this filesystem type. */
-	rc = security_fs_use(sb->s_type->name, &sbsec->behavior, &sbsec->sid);
+	rc = security_fs_use(sbsec->proc ? "proc" : sb->s_type->name, &sbsec->behavior, &sbsec->sid);
 	if (rc) {
 		printk(KERN_WARNING "%s: security_fs_use(%s) returned %d\n",
 		       __func__, sb->s_type->name, rc);