Commit 1be2172e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 3c18767a ece1996a

arch/powerpc/platforms/pseries/cmm.c

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static void cmm_exit(void) 
 * Return value:

 * 	0 on success / other on failure

 **/

static int cmm_set_disable(const char *val, struct kernel_param *kp)

static int cmm_set_disable(const char *val, const struct kernel_param *kp)

{

	int disable = simple_strtoul(val, NULL, 10);

arch/x86/oprofile/nmi_int.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ enum __force_cpu_type { 


static int force_cpu_type;



static int set_cpu_type(const char *str, struct kernel_param *kp)

static int set_cpu_type(const char *str, const struct kernel_param *kp)

{

	if (!strcmp(str, "timer")) {

		force_cpu_type = timer;

drivers/acpi/button.c

+4 −2
Original line number Diff line number Diff line
@@ -573,7 +573,8 @@ static int acpi_button_remove(struct acpi_device *device) 
	return 0;

}



static int param_set_lid_init_state(const char *val, struct kernel_param *kp)

static int param_set_lid_init_state(const char *val,

				    const struct kernel_param *kp)

{

	int result = 0;
@@ -591,7 +592,8 @@ static int param_set_lid_init_state(const char *val, struct kernel_param *kp) 
	return result;

}



static int param_get_lid_init_state(char *buffer, struct kernel_param *kp)

static int param_get_lid_init_state(char *buffer,

				    const struct kernel_param *kp)

{

	switch (lid_init_state) {

	case ACPI_BUTTON_LID_INIT_OPEN:

drivers/acpi/ec.c

+4 −2
Original line number Diff line number Diff line
@@ -1941,7 +1941,8 @@ static const struct dev_pm_ops acpi_ec_pm = { 
	SET_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend, acpi_ec_resume)

};



static int param_set_event_clearing(const char *val, struct kernel_param *kp)

static int param_set_event_clearing(const char *val,

				    const struct kernel_param *kp)

{

	int result = 0;
@@ -1959,7 +1960,8 @@ static int param_set_event_clearing(const char *val, struct kernel_param *kp) 
	return result;

}



static int param_get_event_clearing(char *buffer, struct kernel_param *kp)

static int param_get_event_clearing(char *buffer,

				    const struct kernel_param *kp)

{

	switch (ec_event_clearing) {

	case ACPI_EC_EVT_TIMING_STATUS:

drivers/acpi/sysfs.c

+5 −3
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ module_param_cb(trace_method_name, &param_ops_trace_method, &trace_method_name, 
module_param_cb(trace_debug_layer, &param_ops_trace_attrib, &acpi_gbl_trace_dbg_layer, 0644);

module_param_cb(trace_debug_level, &param_ops_trace_attrib, &acpi_gbl_trace_dbg_level, 0644);



static int param_set_trace_state(const char *val, struct kernel_param *kp)

static int param_set_trace_state(const char *val,

				 const struct kernel_param *kp)

{

	acpi_status status;

	const char *method = trace_method_name;
@@ -267,7 +268,7 @@ static int param_set_trace_state(const char *val, struct kernel_param *kp) 
	return 0;

}



static int param_get_trace_state(char *buffer, struct kernel_param *kp)

static int param_get_trace_state(char *buffer, const struct kernel_param *kp)

{

	if (!(acpi_gbl_trace_flags & ACPI_TRACE_ENABLED))

		return sprintf(buffer, "disable");
@@ -296,7 +297,8 @@ MODULE_PARM_DESC(aml_debug_output, 
		 "To enable/disable the ACPI Debug Object output.");



/* /sys/module/acpi/parameters/acpica_version */

static int param_get_acpica_version(char *buffer, struct kernel_param *kp)

static int param_get_acpica_version(char *buffer,

				    const struct kernel_param *kp)

{

	int result;

CRA Git | Maintained and supported by SUSTech CRA and CCSE