Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / include / linux / moduleparam.h

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 1c9effa25e2632497384e973a28954f7e33aedbc..1160bddd4d66c0214b6c0e8c6c6074eebddd714a 100644 (file)
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
  * @len is usually just sizeof(string).
  */
 #define module_param_string(name, string, len, perm)                   \
-       static const struct kparam_string __param_string_##name         \
+       static const struct kparam_string __param_string_##name __used  \
                = { len, string };                                      \
        __module_param_call(MODULE_PARAM_PREFIX, name,                  \
                            &param_ops_string,                          \
@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
  */
 #define module_param_array_named(name, array, type, nump, perm)                \
        param_check_##type(name, &(array)[0]);                          \
-       static const struct kparam_array __param_arr_##name             \
+       static const struct kparam_array __param_arr_##name __used      \
        = { .max = ARRAY_SIZE(array), .num = nump,                      \
            .ops = &param_ops_##type,                                   \
            .elemsize = sizeof(array[0]), .elem = array };              \