diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
| commit | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch) | |
| tree | beba3ecc27c64e0c22b1a21201f1999afe9834f2 /mm | |
| parent | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff) | |
| parent | b2cd64153b94473f6bd82448a68b8e8c041676ea (diff) | |
| download | op-kernel-dev-5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a.zip op-kernel-dev-5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a.tar.gz | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 3 | ||||
| -rw-r--r-- | mm/slub.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 7b48b2a..edb1b0b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -670,7 +670,8 @@ repeat: page = find_lock_page(mapping, index); if (!page) { if (!cached_page) { - cached_page = alloc_page(gfp_mask); + cached_page = + __page_cache_alloc(gfp_mask); if (!cached_page) return NULL; } @@ -2522,7 +2522,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, struct kmem_cache *s; down_write(&slub_lock); - s = find_mergeable(size, align, flags, dtor, ctor); + s = find_mergeable(size, align, flags, ctor, dtor); if (s) { s->refcount++; /* |
