Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 73674
b: refs/heads/master
c: cfe36bd
h: refs/heads/master
v: v3
  • Loading branch information
Diego Calleja authored and Linus Torvalds committed Nov 15, 2007
1 parent e79da13 commit 9af5db3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8cd8fa557f439f23baef2158b271667d0c579482
refs/heads/master: cfe36bde59bc1ae868e775ad82386c3acaabb738
9 changes: 4 additions & 5 deletions trunk/kernel/cgroup.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
* kernel/cgroup.c
*
* Generic process-grouping system.
*
* Based originally on the cpuset system, extracted by Paul Menage
Expand Down Expand Up @@ -2200,7 +2198,8 @@ static void cgroup_init_subsys(struct cgroup_subsys *ss)
{
struct cgroup_subsys_state *css;
struct list_head *l;
printk(KERN_ERR "Initializing cgroup subsys %s\n", ss->name);

printk(KERN_INFO "Initializing cgroup subsys %s\n", ss->name);

/* Create the top cgroup state for this subsystem */
ss->root = &rootnode;
Expand Down Expand Up @@ -2273,7 +2272,7 @@ int __init cgroup_init_early(void)
BUG_ON(!ss->create);
BUG_ON(!ss->destroy);
if (ss->subsys_id != i) {
printk(KERN_ERR "Subsys %s id == %d\n",
printk(KERN_ERR "cgroup: Subsys %s id == %d\n",
ss->name, ss->subsys_id);
BUG();
}
Expand Down Expand Up @@ -2605,7 +2604,7 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys)
dentry = lookup_one_len(nodename, parent->dentry, strlen(nodename));
if (IS_ERR(dentry)) {
printk(KERN_INFO
"Couldn't allocate dentry for %s: %ld\n", nodename,
"cgroup: Couldn't allocate dentry for %s: %ld\n", nodename,
PTR_ERR(dentry));
ret = PTR_ERR(dentry);
goto out_release;
Expand Down

0 comments on commit 9af5db3

Please sign in to comment.