From 47910d7b8af40ffaccc8845d10d109871b5be604 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Sat, 3 Feb 2007 11:28:17 +0000 Subject: merge to fuse_2_6_merge2 --- kernel/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/dev.c') diff --git a/kernel/dev.c b/kernel/dev.c index 252fe5c..d1885cd 100644 --- a/kernel/dev.c +++ b/kernel/dev.c @@ -43,7 +43,7 @@ static void fuse_request_init(struct fuse_req *req) struct fuse_req *fuse_request_alloc(void) { - struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, SLAB_KERNEL); + struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, GFP_KERNEL); if (req) fuse_request_init(req); return req; -- cgit v1.2.3