|
@@ -1350,10 +1350,9 @@ slab_out_of_memory(struct kmem_cache *cachep, gfp_t gfpflags, int nodeid)
|
|
|
if ((gfpflags & __GFP_NOWARN) || !__ratelimit(&slab_oom_rs))
|
|
|
return;
|
|
|
|
|
|
- printk(KERN_WARNING
|
|
|
- "SLAB: Unable to allocate memory on node %d (gfp=0x%x)\n",
|
|
|
- nodeid, gfpflags);
|
|
|
- printk(KERN_WARNING " cache: %s, object size: %d, order: %d\n",
|
|
|
+ pr_warn("SLAB: Unable to allocate memory on node %d, gfp=%#x(%pGg)\n",
|
|
|
+ nodeid, gfpflags, &gfpflags);
|
|
|
+ pr_warn(" cache: %s, object size: %d, order: %d\n",
|
|
|
cachep->name, cachep->size, cachep->gfporder);
|
|
|
|
|
|
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)
|
|
|
|
|
|
num_slabs += active_slabs;
|
|
|
num_objs = num_slabs * cachep->num;
|
|
|
- printk(KERN_WARNING
|
|
|
- " node %d: slabs: %ld/%ld, objs: %ld/%ld, free: %ld\n",
|
|
|
+ pr_warn(" node %d: slabs: %ld/%ld, objs: %ld/%ld, free: %ld\n",
|
|
|
node, active_slabs, num_slabs, active_objs, num_objs,
|
|
|
free_objects);
|
|
|
}
|