projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
[linux-drm-fsl-dcu.git]
/
kernel
/
params.c
diff --git
a/kernel/params.c
b/kernel/params.c
index 1fc4ac746cd8b7c5f9fd9310741beee1397f8c9b..e61c46c97ce72ec1fb9615783e02dd4afb7c9990 100644
(file)
--- a/
kernel/params.c
+++ b/
kernel/params.c
@@
-269,7
+269,7
@@
int param_get_invbool(char *buffer, struct kernel_param *kp)
return param_get_bool(buffer, &dummy);
}
return param_get_bool(buffer, &dummy);
}
-/* We
cheat here and temporarily
mangle the string. */
+/* We
break the rule and
mangle the string. */
static int param_array(const char *name,
const char *val,
unsigned int min, unsigned int max,
static int param_array(const char *name,
const char *val,
unsigned int min, unsigned int max,
@@
-691,6
+691,7
@@
static struct kset_uevent_ops module_uevent_ops = {
};
decl_subsys(module, &module_ktype, &module_uevent_ops);
};
decl_subsys(module, &module_ktype, &module_uevent_ops);
+int module_sysfs_initialized;
static struct kobj_type module_ktype = {
.sysfs_ops = &module_sysfs_ops,
static struct kobj_type module_ktype = {
.sysfs_ops = &module_sysfs_ops,
@@
-709,6
+710,7
@@
static int __init param_sysfs_init(void)
__FILE__, __LINE__, ret);
return ret;
}
__FILE__, __LINE__, ret);
return ret;
}
+ module_sysfs_initialized = 1;
param_sysfs_builtin();
param_sysfs_builtin();