diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
commit | 36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch) | |
tree | c5b52547b2658a8a3b898b8224b835a7e8396017 /mm | |
parent | 95916edd02e3a7752315422f386c55723d4a3637 (diff) | |
parent | f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff) |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'mm')
-rw-r--r-- | mm/filemap.c | 2 | ||||
-rw-r--r-- | mm/slab.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index d087fc3d328..b9a60c43b61 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -849,8 +849,6 @@ static void shrink_readahead_size_eio(struct file *filp, return; ra->ra_pages /= 4; - printk(KERN_WARNING "Reducing readahead size to %luK\n", - ra->ra_pages << (PAGE_CACHE_SHIFT - 10)); } /** diff --git a/mm/slab.c b/mm/slab.c index 0f20843beff..21ba0603570 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1106,7 +1106,7 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp) #endif -static int __devinit cpuup_callback(struct notifier_block *nfb, +static int __cpuinit cpuup_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { long cpu = (long)hcpu; @@ -3224,7 +3224,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags) EXPORT_SYMBOL(kmem_cache_alloc); /** - * kmem_cache_alloc - Allocate an object. The memory is set to zero. + * kmem_cache_zalloc - Allocate an object. The memory is set to zero. * @cache: The cache to allocate from. * @flags: See kmalloc(). * |