Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ca739e3 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

cgroups: make messages more readable 



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

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Paul Menage <menage@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 28f06c6f

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1544,6 +1544,7 @@ L: containers@lists.linux-foundation.org 
S:	Maintained

F:	include/linux/cgroup*

F:	kernel/cgroup*

F:	mm/*cgroup*



CORETEMP HARDWARE MONITORING DRIVER

P:	Rudolf Marek

mm/page_cgroup.c

+7 −7
Original line number Diff line number Diff line
@@ -83,12 +83,12 @@ void __init page_cgroup_init_flatmem(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");

}
@@ -252,14 +252,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)