From: Andrew Morton <akpm@osdl.org>

Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/ecryptfs/keystore.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/ecryptfs/keystore.c~ecryptfs-public-key-packet-management-slab-fix fs/ecryptfs/keystore.c
--- a/fs/ecryptfs/keystore.c~ecryptfs-public-key-packet-management-slab-fix
+++ a/fs/ecryptfs/keystore.c
@@ -538,7 +538,7 @@ parse_tag_1_packet(struct ecryptfs_crypt
 	 * at end of function upon failure */
 	auth_tok_list_item =
 		kmem_cache_alloc(ecryptfs_auth_tok_list_item_cache,
-				 SLAB_KERNEL);
+				 GFP_KERNEL);
 	if (!auth_tok_list_item) {
 		ecryptfs_printk(KERN_ERR, "Unable to allocate memory\n");
 		rc = -ENOMEM;
_