From: Randy Dunlap <[email protected]> Fix some cgroup messages to read better. Update MAINTAINERS to include mm/*cgroup* files.
Signed-off-by: Randy Dunlap <[email protected]> --- MAINTAINERS | 1 + mm/page_cgroup.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) --- lnx-2630-rc3.orig/mm/page_cgroup.c +++ lnx-2630-rc3/mm/page_cgroup.c @@ -83,12 +83,12 @@ void __init page_cgroup_init(void) goto fail; } printk(KERN_INFO "allocated %ld bytes of page_cgroup\n", total_usage); - printk(KERN_INFO "please try cgroup_disable=memory option if you" - " don't want\n"); + printk(KERN_INFO "please try 'cgroup_disable=memory' option if you" + " don't want memory cgroups\n"); return; fail: - printk(KERN_CRIT "allocation of page_cgroup was failed.\n"); - printk(KERN_CRIT "please try cgroup_disable=memory boot option\n"); + printk(KERN_CRIT "allocation of page_cgroup failed.\n"); + printk(KERN_CRIT "please try 'cgroup_disable=memory' boot option\n"); panic("Out of memory"); } @@ -257,14 +257,14 @@ void __init page_cgroup_init(void) fail = init_section_page_cgroup(pfn); } if (fail) { - printk(KERN_CRIT "try cgroup_disable=memory boot option\n"); + printk(KERN_CRIT "try 'cgroup_disable=memory' boot option\n"); panic("Out of memory"); } else { hotplug_memory_notifier(page_cgroup_callback, 0); } printk(KERN_INFO "allocated %ld bytes of page_cgroup\n", total_usage); - printk(KERN_INFO "please try cgroup_disable=memory option if you don't" - " want\n"); + printk(KERN_INFO "please try 'cgroup_disable=memory' option if you don't" + " want memory cgroups\n"); } void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat) --- lnx-2630-rc3.orig/MAINTAINERS +++ lnx-2630-rc3/MAINTAINERS @@ -1519,6 +1519,7 @@ L: [email protected] S: Maintained F: include/linux/cgroup* F: kernel/cgroup* +F: mm/*cgroup* CORETEMP HARDWARE MONITORING DRIVER P: Rudolf Marek _______________________________________________ Containers mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/containers _______________________________________________ Devel mailing list [email protected] https://openvz.org/mailman/listinfo/devel
