binder: Fix duplicate module parameters

binder.c and binder_alloc.c both define a debug_mask module parameter,
which was fine when they were two separate built-in "modules".  Now
that they're grouped together we need to distinguish these parameters,
so rename the one in binder_alloc.c to alloc_debug_mask.
This commit is contained in:
Ben Hutchings 2018-06-26 20:48:57 +01:00
parent 6c7df557db
commit 6f97cae880
1 changed files with 11 additions and 0 deletions

View File

@ -71,3 +71,14 @@ need them.
device_initcall(ashmem_init);
+
+MODULE_LICENSE("GPL v2");
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -42,7 +42,7 @@ enum {
};
static uint32_t binder_alloc_debug_mask;
-module_param_named(debug_mask, binder_alloc_debug_mask,
+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
uint, 0644);
#define binder_alloc_debug(mask, x...) \