diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 22:46:33 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 22:46:33 +0100 |
commit | 1be2172e96e33bfa22a5c7a651f768ef30ce3984 (patch) | |
tree | c5bf050b3914b43976f9c3ae686b21b4175e29c4 /drivers/md/md.c | |
parent | Merge tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujit... (diff) | |
parent | module: Do not paper over type mismatches in module_param_call() (diff) | |
download | linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.tar.xz linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.zip |
Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull module updates from Jessica Yu:
"Summary of modules changes for the 4.15 merge window:
- treewide module_param_call() cleanup, fix up set/get function
prototype mismatches, from Kees Cook
- minor code cleanups"
* tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
module: Do not paper over type mismatches in module_param_call()
treewide: Fix function prototypes for module_param_call()
module: Prepare to convert all module_param_call() prototypes
kernel/module: Delete an error message for a failed memory allocation in add_module_usage()
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 09c3af3dcdca..c3dc134b9fb5 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5375,7 +5375,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data) return NULL; } -static int add_named_array(const char *val, struct kernel_param *kp) +static int add_named_array(const char *val, const struct kernel_param *kp) { /* * val must be "md_*" or "mdNNN". @@ -9315,11 +9315,11 @@ static __exit void md_exit(void) subsys_initcall(md_init); module_exit(md_exit) -static int get_ro(char *buffer, struct kernel_param *kp) +static int get_ro(char *buffer, const struct kernel_param *kp) { return sprintf(buffer, "%d", start_readonly); } -static int set_ro(const char *val, struct kernel_param *kp) +static int set_ro(const char *val, const struct kernel_param *kp) { return kstrtouint(val, 10, (unsigned int *)&start_readonly); } |