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

This commit is contained in:
Trond Myklebust
2006-12-07 16:35:17 -05:00
1227 changed files with 24634 additions and 14278 deletions

View File

@@ -21,13 +21,13 @@
#define NFS_PARANOIA 1
static kmem_cache_t *nfs_page_cachep;
static struct kmem_cache *nfs_page_cachep;
static inline struct nfs_page *
nfs_page_alloc(void)
{
struct nfs_page *p;
p = kmem_cache_alloc(nfs_page_cachep, SLAB_KERNEL);
p = kmem_cache_alloc(nfs_page_cachep, GFP_KERNEL);
if (p) {
memset(p, 0, sizeof(*p));
INIT_LIST_HEAD(&p->wb_list);