diff --git a/[refs] b/[refs]
index 0e0b8f447ded..ee89d9ce934c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db4c9641def55d36a6f9df79deb8a949292313ca
+refs/heads/master: 26d2a4be6a56eec575dac651f6606756a971f0fb
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 1bb5eea3b8c1..5e61635610bb 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -192,7 +192,7 @@ static int file_alloc_security(struct file *file)
 	struct task_security_struct *tsec = current->security;
 	struct file_security_struct *fsec;
 
-	fsec = kzalloc(sizeof(struct file_security_struct), GFP_ATOMIC);
+	fsec = kzalloc(sizeof(struct file_security_struct), GFP_KERNEL);
 	if (!fsec)
 		return -ENOMEM;