projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
[cascardo/linux.git]
/
kernel
/
params.c
diff --git
a/kernel/params.c
b/kernel/params.c
index
3121723
..
effbaae
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,
@@
-491,7
+491,6
@@
param_sysfs_setup(struct module_kobject *mk,
pattr->mattr.show = param_attr_show;
pattr->mattr.store = param_attr_store;
pattr->mattr.attr.name = (char *)&kp->name[name_skip];
pattr->mattr.show = param_attr_show;
pattr->mattr.store = param_attr_store;
pattr->mattr.attr.name = (char *)&kp->name[name_skip];
- pattr->mattr.attr.owner = mk->mod;
pattr->mattr.attr.mode = kp->perm;
*(gattr++) = &(pattr++)->mattr.attr;
}
pattr->mattr.attr.mode = kp->perm;
*(gattr++) = &(pattr++)->mattr.attr;
}