Merge tag 'perf-urgent-2020-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / params.c

diff --git a/kernel/params.c b/kernel/params.c
index 8e56f8b..164d793 100644 (file)
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -233,14 +233,15 @@ char *parse_args(const char *doing,
        EXPORT_SYMBOL(param_ops_##name)
 
 
-STANDARD_PARAM_DEF(byte,       unsigned char,          "%hhu", kstrtou8);
-STANDARD_PARAM_DEF(short,      short,                  "%hi",  kstrtos16);
-STANDARD_PARAM_DEF(ushort,     unsigned short,         "%hu",  kstrtou16);
-STANDARD_PARAM_DEF(int,                int,                    "%i",   kstrtoint);
-STANDARD_PARAM_DEF(uint,       unsigned int,           "%u",   kstrtouint);
-STANDARD_PARAM_DEF(long,       long,                   "%li",  kstrtol);
-STANDARD_PARAM_DEF(ulong,      unsigned long,          "%lu",  kstrtoul);
-STANDARD_PARAM_DEF(ullong,     unsigned long long,     "%llu", kstrtoull);
+STANDARD_PARAM_DEF(byte,       unsigned char,          "%hhu",         kstrtou8);
+STANDARD_PARAM_DEF(short,      short,                  "%hi",          kstrtos16);
+STANDARD_PARAM_DEF(ushort,     unsigned short,         "%hu",          kstrtou16);
+STANDARD_PARAM_DEF(int,                int,                    "%i",           kstrtoint);
+STANDARD_PARAM_DEF(uint,       unsigned int,           "%u",           kstrtouint);
+STANDARD_PARAM_DEF(long,       long,                   "%li",          kstrtol);
+STANDARD_PARAM_DEF(ulong,      unsigned long,          "%lu",          kstrtoul);
+STANDARD_PARAM_DEF(ullong,     unsigned long long,     "%llu",         kstrtoull);
+STANDARD_PARAM_DEF(hexint,     unsigned int,           "%#08x",        kstrtouint);
 
 int param_set_charp(const char *val, const struct kernel_param *kp)
 {
@@ -529,7 +530,7 @@ struct module_param_attrs
 {
        unsigned int num;
        struct attribute_group grp;
-       struct param_attribute attrs[0];
+       struct param_attribute attrs[];
 };
 
 #ifdef CONFIG_SYSFS