Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0f2d79d16949699bcd1eba1f2c4881908ec9f574..41c050b59ec454f139b359fdcdc116d964103d61 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5374,7 +5374,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".
@@ -9314,11 +9314,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);
 }