cgroups: add cpu_relax() calls in css_tryget() and cgroup_clear_css_refs()

[safe/jmp/linux-2.6] / kernel / params.c

diff --git a/kernel/params.c b/kernel/params.c
index f27c992..a1e3025 100644 (file)
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -510,6 +510,7 @@ fail:
        return err;
 }
 
+#ifdef CONFIG_MODULES
 static void free_module_param_attrs(struct module_kobject *mk)
 {
        kfree(mk->mp->grp.attrs);
@@ -517,7 +518,6 @@ static void free_module_param_attrs(struct module_kobject *mk)
        mk->mp = NULL;
 }
 
-#ifdef CONFIG_MODULES
 /*
  * module_param_sysfs_setup - setup sysfs support for one module
  * @mod: module
@@ -637,14 +637,14 @@ static void __init param_sysfs_builtin(void)
 
                dot = strchr(kp->name, '.');
                if (!dot) {
-                       DEBUGP("couldn't find period in first %d characters "
-                              "of %s\n", MODULE_NAME_LEN, kp->name);
-                       continue;
+                       /* This happens for core_param() */
+                       strcpy(modname, "kernel");
+                       name_len = 0;
+               } else {
+                       name_len = dot - kp->name + 1;
+                       strlcpy(modname, kp->name, name_len);
                }
-               name_len = dot - kp->name;
-               strncpy(modname, kp->name, name_len);
-               modname[name_len] = '\0';
-               kernel_add_sysfs_param(modname, kp, name_len+1);
+               kernel_add_sysfs_param(modname, kp, name_len);
        }
 }