xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

Browse Source
This commit is contained in:
Trond Myklebust
2006-12-07 16:35:17 -05:00
parent 34161db6b1 68380b5813
commit 21b4e73692
1227 changed files with 24634 additions and 14278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/direct.c
View File

@@ -58,7 +58,7 @@
#define NFSDBG_FACILITY NFSDBG_VFS
static kmem_cache_t *nfs_direct_cachep;
static struct kmem_cache *nfs_direct_cachep;
/*
* This represents a set of asynchronous requests that we're waiting on
@@ -143,7 +143,7 @@ static inline struct nfs_direct_req *nfs_direct_req_alloc(void)
{
struct nfs_direct_req *dreq;
dreq = kmem_cache_alloc(nfs_direct_cachep, SLAB_KERNEL);
dreq = kmem_cache_alloc(nfs_direct_cachep, GFP_KERNEL);
if (!dreq)
return NULL;