summaryrefslogtreecommitdiffstats
path: root/drivers/android
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-15 13:46:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-15 13:46:33 -0800
commit1be2172e96e33bfa22a5c7a651f768ef30ce3984 (patch)
treec5bf050b3914b43976f9c3ae686b21b4175e29c4 /drivers/android
parent3c18767a45650009d02537677ffb7997bd402a2c (diff)
parentece1996a21eeb344b49200e627c6660111009c10 (diff)
downloadlinux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.tar.gz
linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.tar.bz2
linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.zip
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()
Diffstat (limited to 'drivers/android')
-rw-r--r--drivers/android/binder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index fddf76ef5bd6..7255f94ded30 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -150,7 +150,7 @@ static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);
static int binder_stop_on_user_error;
static int binder_set_stop_on_user_error(const char *val,
- struct kernel_param *kp)
+ const struct kernel_param *kp)
{
int ret;