fix struct user_info export's sysfs interaction

[linux-2.6-omap-h63xx.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 5987dccdb2a0bad4de04333dfa0e45b0690d3405..1a3c23936d43d99ec3d429123c95182a94de0c02 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1,6 +1,4 @@
 /*
- *  kernel/cgroup.c
- *
  *  Generic process-grouping system.
  *
  *  Based originally on the cpuset system, extracted by Paul Menage
@@ -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;
@@ -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();
                }
@@ -2402,7 +2401,6 @@ struct file_operations proc_cgroup_operations = {
 static int proc_cgroupstats_show(struct seq_file *m, void *v)
 {
        int i;
-       struct cgroupfs_root *root;
 
        seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\n");
        mutex_lock(&cgroup_mutex);
@@ -2606,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;