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()
This commit is contained in:
@@ -50,7 +50,7 @@ EXPORT_SYMBOL_GPL(svc_pool_map);
|
||||
static DEFINE_MUTEX(svc_pool_map_mutex);/* protects svc_pool_map.count only */
|
||||
|
||||
static int
|
||||
param_set_pool_mode(const char *val, struct kernel_param *kp)
|
||||
param_set_pool_mode(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int *ip = (int *)kp->arg;
|
||||
struct svc_pool_map *m = &svc_pool_map;
|
||||
@@ -80,7 +80,7 @@ out:
|
||||
}
|
||||
|
||||
static int
|
||||
param_get_pool_mode(char *buf, struct kernel_param *kp)
|
||||
param_get_pool_mode(char *buf, const struct kernel_param *kp)
|
||||
{
|
||||
int *ip = (int *)kp->arg;
|
||||
|
||||
|
Reference in New Issue
Block a user