aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/page_cgroup.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index 11a8a10a3909..4f31c9b3e940 100644
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -83,12 +83,12 @@ void __init page_cgroup_init_flatmem(void)
83 goto fail; 83 goto fail;
84 } 84 }
85 printk(KERN_INFO "allocated %ld bytes of page_cgroup\n", total_usage); 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" 86 printk(KERN_INFO "please try 'cgroup_disable=memory' option if you"
87 " don't want\n"); 87 " don't want memory cgroups\n");
88 return; 88 return;
89fail: 89fail:
90 printk(KERN_CRIT "allocation of page_cgroup was failed.\n"); 90 printk(KERN_CRIT "allocation of page_cgroup failed.\n");
91 printk(KERN_CRIT "please try cgroup_disable=memory boot option\n"); 91 printk(KERN_CRIT "please try 'cgroup_disable=memory' boot option\n");
92 panic("Out of memory"); 92 panic("Out of memory");
93} 93}
94 94
@@ -252,14 +252,14 @@ void __init page_cgroup_init(void)
252 fail = init_section_page_cgroup(pfn); 252 fail = init_section_page_cgroup(pfn);
253 } 253 }
254 if (fail) { 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 panic("Out of memory"); 256 panic("Out of memory");
257 } else { 257 } else {
258 hotplug_memory_notifier(page_cgroup_callback, 0); 258 hotplug_memory_notifier(page_cgroup_callback, 0);
259 } 259 }
260 printk(KERN_INFO "allocated %ld bytes of page_cgroup\n", total_usage); 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" 261 printk(KERN_INFO "please try 'cgroup_disable=memory' option if you don't"
262 " want\n"); 262 " want memory cgroups\n");
263} 263}
264 264
265void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat) 265void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat)