Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 8ca739e3694b83cdf22be0f6eff063e721deb1e4

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent 28f06c6f4b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

cgroups: make messages more readable 

Fix some cgroup messages to read better.
Update MAINTAINERS to include mm/*cgroup* files.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Paul Menage <menage@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 8 additions and 7 deletions Side-by-side Diff

... ... @@ -1544,6 +1544,7 @@
1544 1544 S: Maintained
1545 1545 F: include/linux/cgroup*
1546 1546 F: kernel/cgroup*
  1547 +F: mm/*cgroup*
1547 1548  
1548 1549 CORETEMP HARDWARE MONITORING DRIVER
1549 1550 P: Rudolf Marek
... ... @@ -83,12 +83,12 @@
83 83 goto fail;
84 84 }
85 85 printk(KERN_INFO "allocated %ld bytes of page_cgroup\n", total_usage);
86   - printk(KERN_INFO "please try cgroup_disable=memory option if you"
87   - " don't want\n");
  86 + printk(KERN_INFO "please try 'cgroup_disable=memory' option if you"
  87 + " don't want memory cgroups\n");
88 88 return;
89 89 fail:
90   - printk(KERN_CRIT "allocation of page_cgroup was failed.\n");
91   - printk(KERN_CRIT "please try cgroup_disable=memory boot option\n");
  90 + printk(KERN_CRIT "allocation of page_cgroup failed.\n");
  91 + printk(KERN_CRIT "please try 'cgroup_disable=memory' boot option\n");
92 92 panic("Out of memory");
93 93 }
94 94  
95 95  
... ... @@ -252,14 +252,14 @@
252 252 fail = init_section_page_cgroup(pfn);
253 253 }
254 254 if (fail) {
255   - printk(KERN_CRIT "try cgroup_disable=memory boot option\n");
  255 + printk(KERN_CRIT "try 'cgroup_disable=memory' boot option\n");
256 256 panic("Out of memory");
257 257 } else {
258 258 hotplug_memory_notifier(page_cgroup_callback, 0);
259 259 }
260 260 printk(KERN_INFO "allocated %ld bytes of page_cgroup\n", total_usage);
261   - printk(KERN_INFO "please try cgroup_disable=memory option if you don't"
262   - " want\n");
  261 + printk(KERN_INFO "please try 'cgroup_disable=memory' option if you don't"
  262 + " want memory cgroups\n");
263 263 }
264 264  
265 265 void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat)