Skip to content

Commit

Permalink
module: Prepare to convert all module_param_call() prototypes
Browse files Browse the repository at this point in the history
After actually converting all module_param_call() function prototypes, we
no longer need to do a tricky sizeof(func(thing)) type-check. Remove it.

Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: Jessica Yu <[email protected]>
  • Loading branch information
kees authored and Jessica Yu committed Oct 31, 2017
1 parent 9ad0457 commit b2f270e
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions include/linux/moduleparam.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,18 +228,10 @@ struct kparam_array

/* Obsolete - use module_param_cb() */
#define module_param_call(name, set, get, arg, perm) \
static const struct kernel_param_ops __param_ops_##name = \
static const struct kernel_param_ops __param_ops_##name = \
{ .flags = 0, (void *)set, (void *)get }; \
__module_param_call(MODULE_PARAM_PREFIX, \
name, &__param_ops_##name, arg, \
(perm) + sizeof(__check_old_set_param(set))*0, -1, 0)

/* We don't get oldget: it's often a new-style param_get_uint, etc. */
static inline int
__check_old_set_param(int (*oldset)(const char *, struct kernel_param *))
{
return 0;
}
name, &__param_ops_##name, arg, perm, -1, 0)

#ifdef CONFIG_SYSFS
extern void kernel_param_lock(struct module *mod);
Expand Down

0 comments on commit b2f270e

Please sign in to comment.