aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c10
-rw-r--r--mm/slub.c4
2 files changed, 6 insertions, 8 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 863c005a3d9c..852fc5c79829 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1350,10 +1350,9 @@ slab_out_of_memory(struct kmem_cache *cachep, gfp_t gfpflags, int nodeid)
1350 if ((gfpflags & __GFP_NOWARN) || !__ratelimit(&slab_oom_rs)) 1350 if ((gfpflags & __GFP_NOWARN) || !__ratelimit(&slab_oom_rs))
1351 return; 1351 return;
1352 1352
1353 printk(KERN_WARNING 1353 pr_warn("SLAB: Unable to allocate memory on node %d, gfp=%#x(%pGg)\n",
1354 "SLAB: Unable to allocate memory on node %d (gfp=0x%x)\n", 1354 nodeid, gfpflags, &gfpflags);
1355 nodeid, gfpflags); 1355 pr_warn(" cache: %s, object size: %d, order: %d\n",
1356 printk(KERN_WARNING " cache: %s, object size: %d, order: %d\n",
1357 cachep->name, cachep->size, cachep->gfporder); 1356 cachep->name, cachep->size, cachep->gfporder);
1358 1357
1359 for_each_kmem_cache_node(cachep, node, n) { 1358 for_each_kmem_cache_node(cachep, node, n) {
@@ -1377,8 +1376,7 @@ slab_out_of_memory(struct kmem_cache *cachep, gfp_t gfpflags, int nodeid)
1377 1376
1378 num_slabs += active_slabs; 1377 num_slabs += active_slabs;
1379 num_objs = num_slabs * cachep->num; 1378 num_objs = num_slabs * cachep->num;
1380 printk(KERN_WARNING 1379 pr_warn(" node %d: slabs: %ld/%ld, objs: %ld/%ld, free: %ld\n",
1381 " node %d: slabs: %ld/%ld, objs: %ld/%ld, free: %ld\n",
1382 node, active_slabs, num_slabs, active_objs, num_objs, 1380 node, active_slabs, num_slabs, active_objs, num_objs,
1383 free_objects); 1381 free_objects);
1384 } 1382 }
diff --git a/mm/slub.c b/mm/slub.c
index 2d4d817f3d7a..6c91324f9370 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2236,8 +2236,8 @@ slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid)
2236 if ((gfpflags & __GFP_NOWARN) || !__ratelimit(&slub_oom_rs)) 2236 if ((gfpflags & __GFP_NOWARN) || !__ratelimit(&slub_oom_rs))
2237 return; 2237 return;
2238 2238
2239 pr_warn("SLUB: Unable to allocate memory on node %d (gfp=0x%x)\n", 2239 pr_warn("SLUB: Unable to allocate memory on node %d, gfp=%#x(%pGg)\n",
2240 nid, gfpflags); 2240 nid, gfpflags, &gfpflags);
2241 pr_warn(" cache: %s, object size: %d, buffer size: %d, default order: %d, min order: %d\n", 2241 pr_warn(" cache: %s, object size: %d, buffer size: %d, default order: %d, min order: %d\n",
2242 s->name, s->object_size, s->size, oo_order(s->oo), 2242 s->name, s->object_size, s->size, oo_order(s->oo),
2243 oo_order(s->min)); 2243 oo_order(s->min));