Modules updates for v4.15
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 Signed-off-by: Jessica Yu <jeyu@kernel.org> -----BEGIN PGP SIGNATURE----- iQIcBAABCgAGBQJaDCyzAAoJEMBFfjjOO8FyaYQP/AwHBy6XmwwVlWDP4BqIF6hL Vhy3ccVLYEORvePv68tWSRPUz5n6+1Ebqanmwtkw6i8l+KwxY2SfkZql09cARc33 2iBE4bHF98iWQmnJbF6me80fedY9n5bZJNMQKEF9VozJWwTMOTQFTCfmyJRDBmk9 iidQj6M3idbSUOYIJjvc40VGx5NyQWSr+FFfqsz1rU5iLGRGEvA3I2/CDT0oTuV6 D4MmFxzE2Tv/vIMa2GzKJ1LGScuUfSjf93Lq9Kk0cG36qWao8l930CaXyVdE9WJv bkUzpf3QYv/rDX6QbAGA0cada13zd+dfBr8YhchclEAfJ+GDLjMEDu04NEmI6KUT 5lP0Xw0xYNZQI7bkdxDMhsj5jaz/HJpXCjPCtZBnSEKiL4OPXVMe+pBHoCJ2/yFN 6M716XpWYgUviUOdiE+chczB5p3z4FA6u2ykaM4Tlk0btZuHGxjcSWwvcIdlPmjm kY4AfDV6K0bfEBVguWPJicvrkx44atqT5nWbbPhDwTSavtsuRJLb3GCsHedx7K8h ZO47lCQFAWCtrycK1HYw+oupNC3hYWQ0SR42XRdGhL1bq26C+1sei1QhfqSgA9PQ 7CwWH4UTOL9fhtrzSqZngYOh9sjQNFNefqQHcecNzcEjK2vjrgQZvRNWZKHSwaFs fbGX8juZWP4ypbK+irTB =c8vb -----END PGP SIGNATURE----- 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:
commit
1be2172e96
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -231,7 +231,8 @@ module_param_cb(trace_method_name, ¶m_ops_trace_method, &trace_method_name,
|
|||
module_param_cb(trace_debug_layer, ¶m_ops_trace_attrib, &acpi_gbl_trace_dbg_layer, 0644);
|
||||
module_param_cb(trace_debug_level, ¶m_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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ static void (*specific_poweroff_func)(ipmi_user_t user);
|
|||
/* Holds the old poweroff function so we can restore it on removal. */
|
||||
static void (*old_poweroff_func)(void);
|
||||
|
||||
static int set_param_ifnum(const char *val, struct kernel_param *kp)
|
||||
static int set_param_ifnum(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int rv = param_set_int(val, kp);
|
||||
if (rv)
|
||||
|
|
|
@ -1345,7 +1345,7 @@ static unsigned int num_slave_addrs;
|
|||
#define IPMI_MEM_ADDR_SPACE 1
|
||||
static const char * const addr_space_to_str[] = { "i/o", "mem" };
|
||||
|
||||
static int hotmod_handler(const char *val, struct kernel_param *kp);
|
||||
static int hotmod_handler(const char *val, const struct kernel_param *kp);
|
||||
|
||||
module_param_call(hotmod, hotmod_handler, NULL, NULL, 0200);
|
||||
MODULE_PARM_DESC(hotmod, "Add and remove interfaces. See"
|
||||
|
@ -1811,7 +1811,7 @@ static struct smi_info *smi_info_alloc(void)
|
|||
return info;
|
||||
}
|
||||
|
||||
static int hotmod_handler(const char *val, struct kernel_param *kp)
|
||||
static int hotmod_handler(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
char *str = kstrdup(val, GFP_KERNEL);
|
||||
int rv;
|
||||
|
|
|
@ -50,7 +50,7 @@ int edac_mc_get_poll_msec(void)
|
|||
return edac_mc_poll_msec;
|
||||
}
|
||||
|
||||
static int edac_set_poll_msec(const char *val, struct kernel_param *kp)
|
||||
static int edac_set_poll_msec(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
unsigned long l;
|
||||
int ret;
|
||||
|
|
|
@ -19,7 +19,8 @@
|
|||
|
||||
#ifdef CONFIG_EDAC_DEBUG
|
||||
|
||||
static int edac_set_debug_level(const char *buf, struct kernel_param *kp)
|
||||
static int edac_set_debug_level(const char *buf,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
unsigned long val;
|
||||
int ret;
|
||||
|
|
|
@ -34,7 +34,8 @@ module_param(emulate_scroll_wheel, bool, 0644);
|
|||
MODULE_PARM_DESC(emulate_scroll_wheel, "Emulate a scroll wheel");
|
||||
|
||||
static unsigned int scroll_speed = 32;
|
||||
static int param_set_scroll_speed(const char *val, struct kernel_param *kp) {
|
||||
static int param_set_scroll_speed(const char *val,
|
||||
const struct kernel_param *kp) {
|
||||
unsigned long speed;
|
||||
if (!val || kstrtoul(val, 0, &speed) || speed > 63)
|
||||
return -EINVAL;
|
||||
|
|
|
@ -244,7 +244,7 @@ struct chs_geom {
|
|||
static unsigned int ide_disks;
|
||||
static struct chs_geom ide_disks_chs[MAX_HWIFS * MAX_DRIVES];
|
||||
|
||||
static int ide_set_disk_chs(const char *str, struct kernel_param *kp)
|
||||
static int ide_set_disk_chs(const char *str, const struct kernel_param *kp)
|
||||
{
|
||||
unsigned int a, b, c = 0, h = 0, s = 0, i, j = 1;
|
||||
|
||||
|
@ -328,7 +328,7 @@ static void ide_dev_apply_params(ide_drive_t *drive, u8 unit)
|
|||
|
||||
static unsigned int ide_ignore_cable;
|
||||
|
||||
static int ide_set_ignore_cable(const char *s, struct kernel_param *kp)
|
||||
static int ide_set_ignore_cable(const char *s, const struct kernel_param *kp)
|
||||
{
|
||||
int i, j = 1;
|
||||
|
||||
|
|
|
@ -150,7 +150,7 @@ static struct kparam_string kp_txselect = {
|
|||
.string = txselect_list,
|
||||
.maxlen = MAX_ATTEN_LEN
|
||||
};
|
||||
static int setup_txselect(const char *, struct kernel_param *);
|
||||
static int setup_txselect(const char *, const struct kernel_param *);
|
||||
module_param_call(txselect, setup_txselect, param_get_string,
|
||||
&kp_txselect, S_IWUSR | S_IRUGO);
|
||||
MODULE_PARM_DESC(txselect,
|
||||
|
@ -6169,7 +6169,7 @@ static void set_no_qsfp_atten(struct qib_devdata *dd, int change)
|
|||
}
|
||||
|
||||
/* handle the txselect parameter changing */
|
||||
static int setup_txselect(const char *str, struct kernel_param *kp)
|
||||
static int setup_txselect(const char *str, const struct kernel_param *kp)
|
||||
{
|
||||
struct qib_devdata *dd;
|
||||
unsigned long val;
|
||||
|
|
|
@ -80,7 +80,7 @@ module_param(srpt_srq_size, int, 0444);
|
|||
MODULE_PARM_DESC(srpt_srq_size,
|
||||
"Shared receive queue (SRQ) size.");
|
||||
|
||||
static int srpt_get_u64_x(char *buffer, struct kernel_param *kp)
|
||||
static int srpt_get_u64_x(char *buffer, const struct kernel_param *kp)
|
||||
{
|
||||
return sprintf(buffer, "0x%016llx", *(u64 *)kp->arg);
|
||||
}
|
||||
|
|
|
@ -156,7 +156,7 @@ _set_debug(struct fritzcard *card)
|
|||
}
|
||||
|
||||
static int
|
||||
set_debug(const char *val, struct kernel_param *kp)
|
||||
set_debug(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int ret;
|
||||
struct fritzcard *card;
|
||||
|
|
|
@ -244,7 +244,7 @@ _set_debug(struct inf_hw *card)
|
|||
}
|
||||
|
||||
static int
|
||||
set_debug(const char *val, struct kernel_param *kp)
|
||||
set_debug(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int ret;
|
||||
struct inf_hw *card;
|
||||
|
|
|
@ -111,7 +111,7 @@ _set_debug(struct tiger_hw *card)
|
|||
}
|
||||
|
||||
static int
|
||||
set_debug(const char *val, struct kernel_param *kp)
|
||||
set_debug(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int ret;
|
||||
struct tiger_hw *card;
|
||||
|
|
|
@ -94,7 +94,7 @@ _set_debug(struct sfax_hw *card)
|
|||
}
|
||||
|
||||
static int
|
||||
set_debug(const char *val, struct kernel_param *kp)
|
||||
set_debug(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int ret;
|
||||
struct sfax_hw *card;
|
||||
|
|
|
@ -101,7 +101,7 @@ _set_debug(struct w6692_hw *card)
|
|||
}
|
||||
|
||||
static int
|
||||
set_debug(const char *val, struct kernel_param *kp)
|
||||
set_debug(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int ret;
|
||||
struct w6692_hw *card;
|
||||
|
|
|
@ -5375,7 +5375,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int add_named_array(const char *val, struct kernel_param *kp)
|
||||
static int add_named_array(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
/*
|
||||
* val must be "md_*" or "mdNNN".
|
||||
|
@ -9315,11 +9315,11 @@ static __exit void md_exit(void)
|
|||
subsys_initcall(md_init);
|
||||
module_exit(md_exit)
|
||||
|
||||
static int get_ro(char *buffer, struct kernel_param *kp)
|
||||
static int get_ro(char *buffer, const struct kernel_param *kp)
|
||||
{
|
||||
return sprintf(buffer, "%d", start_readonly);
|
||||
}
|
||||
static int set_ro(const char *val, struct kernel_param *kp)
|
||||
static int set_ro(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
return kstrtouint(val, 10, (unsigned int *)&start_readonly);
|
||||
}
|
||||
|
|
|
@ -72,12 +72,12 @@ static const char *dma_mode_name(unsigned int mode)
|
|||
}
|
||||
}
|
||||
|
||||
static int tw686x_dma_mode_get(char *buffer, struct kernel_param *kp)
|
||||
static int tw686x_dma_mode_get(char *buffer, const struct kernel_param *kp)
|
||||
{
|
||||
return sprintf(buffer, "%s", dma_mode_name(dma_mode));
|
||||
}
|
||||
|
||||
static int tw686x_dma_mode_set(const char *val, struct kernel_param *kp)
|
||||
static int tw686x_dma_mode_set(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
if (!strcasecmp(val, dma_mode_name(TW686X_DMA_MODE_MEMCPY)))
|
||||
dma_mode = TW686X_DMA_MODE_MEMCPY;
|
||||
|
|
|
@ -2230,7 +2230,7 @@ static int uvc_reset_resume(struct usb_interface *intf)
|
|||
* Module parameters
|
||||
*/
|
||||
|
||||
static int uvc_clock_param_get(char *buffer, struct kernel_param *kp)
|
||||
static int uvc_clock_param_get(char *buffer, const struct kernel_param *kp)
|
||||
{
|
||||
if (uvc_clock_param == CLOCK_MONOTONIC)
|
||||
return sprintf(buffer, "CLOCK_MONOTONIC");
|
||||
|
@ -2238,7 +2238,7 @@ static int uvc_clock_param_get(char *buffer, struct kernel_param *kp)
|
|||
return sprintf(buffer, "CLOCK_REALTIME");
|
||||
}
|
||||
|
||||
static int uvc_clock_param_set(const char *val, struct kernel_param *kp)
|
||||
static int uvc_clock_param_set(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
if (strncasecmp(val, "clock_", strlen("clock_")) == 0)
|
||||
val += strlen("clock_");
|
||||
|
|
|
@ -99,7 +99,7 @@ module_param(mpt_channel_mapping, int, 0);
|
|||
MODULE_PARM_DESC(mpt_channel_mapping, " Mapping id's to channels (default=0)");
|
||||
|
||||
static int mpt_debug_level;
|
||||
static int mpt_set_debug_level(const char *val, struct kernel_param *kp);
|
||||
static int mpt_set_debug_level(const char *val, const struct kernel_param *kp);
|
||||
module_param_call(mpt_debug_level, mpt_set_debug_level, param_get_int,
|
||||
&mpt_debug_level, 0600);
|
||||
MODULE_PARM_DESC(mpt_debug_level,
|
||||
|
@ -242,7 +242,7 @@ pci_enable_io_access(struct pci_dev *pdev)
|
|||
pci_write_config_word(pdev, PCI_COMMAND, command_reg);
|
||||
}
|
||||
|
||||
static int mpt_set_debug_level(const char *val, struct kernel_param *kp)
|
||||
static int mpt_set_debug_level(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int ret = param_set_int(val, kp);
|
||||
MPT_ADAPTER *ioc;
|
||||
|
|
|
@ -1132,7 +1132,8 @@ static void kgdbts_put_char(u8 chr)
|
|||
ts.run_test(0, chr);
|
||||
}
|
||||
|
||||
static int param_set_kgdbts_var(const char *kmessage, struct kernel_param *kp)
|
||||
static int param_set_kgdbts_var(const char *kmessage,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
int len = strlen(kmessage);
|
||||
|
||||
|
|
|
@ -431,7 +431,7 @@ static int block2mtd_setup2(const char *val)
|
|||
}
|
||||
|
||||
|
||||
static int block2mtd_setup(const char *val, struct kernel_param *kp)
|
||||
static int block2mtd_setup(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
#ifdef MODULE
|
||||
return block2mtd_setup2(val);
|
||||
|
|
|
@ -266,7 +266,7 @@ static int phram_setup(const char *val)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int phram_param_call(const char *val, struct kernel_param *kp)
|
||||
static int phram_param_call(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
#ifdef MODULE
|
||||
return phram_setup(val);
|
||||
|
|
|
@ -1334,7 +1334,7 @@ static int bytes_str_to_int(const char *str)
|
|||
* This function returns zero in case of success and a negative error code in
|
||||
* case of error.
|
||||
*/
|
||||
static int ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
|
||||
static int ubi_mtd_param_parse(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int i, len;
|
||||
struct mtd_dev_param *p;
|
||||
|
|
|
@ -1061,7 +1061,8 @@ void pci_disable_link_state(struct pci_dev *pdev, int state)
|
|||
}
|
||||
EXPORT_SYMBOL(pci_disable_link_state);
|
||||
|
||||
static int pcie_aspm_set_policy(const char *val, struct kernel_param *kp)
|
||||
static int pcie_aspm_set_policy(const char *val,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
int i;
|
||||
struct pcie_link_state *link;
|
||||
|
@ -1088,7 +1089,7 @@ static int pcie_aspm_set_policy(const char *val, struct kernel_param *kp)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pcie_aspm_get_policy(char *buffer, struct kernel_param *kp)
|
||||
static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp)
|
||||
{
|
||||
int i, cnt = 0;
|
||||
for (i = 0; i < ARRAY_SIZE(policy_str); i++)
|
||||
|
|
|
@ -9543,7 +9543,7 @@ static struct ibm_init_struct ibms_init[] __initdata = {
|
|||
},
|
||||
};
|
||||
|
||||
static int __init set_ibm_param(const char *val, struct kernel_param *kp)
|
||||
static int __init set_ibm_param(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
unsigned int i;
|
||||
struct ibm_struct *ibm;
|
||||
|
|
|
@ -32,13 +32,13 @@ MODULE_AUTHOR("Open-FCoE.org");
|
|||
MODULE_DESCRIPTION("FIP discovery protocol and FCoE transport for FCoE HBAs");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
static int fcoe_transport_create(const char *, struct kernel_param *);
|
||||
static int fcoe_transport_destroy(const char *, struct kernel_param *);
|
||||
static int fcoe_transport_create(const char *, const struct kernel_param *);
|
||||
static int fcoe_transport_destroy(const char *, const struct kernel_param *);
|
||||
static int fcoe_transport_show(char *buffer, const struct kernel_param *kp);
|
||||
static struct fcoe_transport *fcoe_transport_lookup(struct net_device *device);
|
||||
static struct fcoe_transport *fcoe_netdev_map_lookup(struct net_device *device);
|
||||
static int fcoe_transport_enable(const char *, struct kernel_param *);
|
||||
static int fcoe_transport_disable(const char *, struct kernel_param *);
|
||||
static int fcoe_transport_enable(const char *, const struct kernel_param *);
|
||||
static int fcoe_transport_disable(const char *, const struct kernel_param *);
|
||||
static int libfcoe_device_notification(struct notifier_block *notifier,
|
||||
ulong event, void *ptr);
|
||||
|
||||
|
@ -867,7 +867,8 @@ EXPORT_SYMBOL(fcoe_ctlr_destroy_store);
|
|||
*
|
||||
* Returns: 0 for success
|
||||
*/
|
||||
static int fcoe_transport_create(const char *buffer, struct kernel_param *kp)
|
||||
static int fcoe_transport_create(const char *buffer,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
int rc = -ENODEV;
|
||||
struct net_device *netdev = NULL;
|
||||
|
@ -932,7 +933,8 @@ out_nodev:
|
|||
*
|
||||
* Returns: 0 for success
|
||||
*/
|
||||
static int fcoe_transport_destroy(const char *buffer, struct kernel_param *kp)
|
||||
static int fcoe_transport_destroy(const char *buffer,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
int rc = -ENODEV;
|
||||
struct net_device *netdev = NULL;
|
||||
|
@ -976,7 +978,8 @@ out_nodev:
|
|||
*
|
||||
* Returns: 0 for success
|
||||
*/
|
||||
static int fcoe_transport_disable(const char *buffer, struct kernel_param *kp)
|
||||
static int fcoe_transport_disable(const char *buffer,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
int rc = -ENODEV;
|
||||
struct net_device *netdev = NULL;
|
||||
|
@ -1010,7 +1013,8 @@ out_nodev:
|
|||
*
|
||||
* Returns: 0 for success
|
||||
*/
|
||||
static int fcoe_transport_enable(const char *buffer, struct kernel_param *kp)
|
||||
static int fcoe_transport_enable(const char *buffer,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
int rc = -ENODEV;
|
||||
struct net_device *netdev = NULL;
|
||||
|
|
|
@ -106,7 +106,7 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc);
|
|||
*
|
||||
*/
|
||||
static int
|
||||
_scsih_set_fwfault_debug(const char *val, struct kernel_param *kp)
|
||||
_scsih_set_fwfault_debug(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int ret = param_set_int(val, kp);
|
||||
struct MPT3SAS_ADAPTER *ioc;
|
||||
|
|
|
@ -288,7 +288,7 @@ struct _scsi_io_transfer {
|
|||
* Note: The logging levels are defined in mpt3sas_debug.h.
|
||||
*/
|
||||
static int
|
||||
_scsih_set_debug_level(const char *val, struct kernel_param *kp)
|
||||
_scsih_set_debug_level(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int ret = param_set_int(val, kp);
|
||||
struct MPT3SAS_ADAPTER *ioc;
|
||||
|
|
|
@ -242,7 +242,8 @@ static void kgdboc_put_char(u8 chr)
|
|||
kgdb_tty_line, chr);
|
||||
}
|
||||
|
||||
static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
|
||||
static int param_set_kgdboc_var(const char *kmessage,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
int len = strlen(kmessage);
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ static struct kmem_cache *fuse_inode_cachep;
|
|||
struct list_head fuse_conn_list;
|
||||
DEFINE_MUTEX(fuse_mutex);
|
||||
|
||||
static int set_global_limit(const char *val, struct kernel_param *kp);
|
||||
static int set_global_limit(const char *val, const struct kernel_param *kp);
|
||||
|
||||
unsigned max_user_bgreq;
|
||||
module_param_call(max_user_bgreq, set_global_limit, param_get_uint,
|
||||
|
@ -823,7 +823,7 @@ static void sanitize_global_limit(unsigned *limit)
|
|||
*limit = (1 << 16) - 1;
|
||||
}
|
||||
|
||||
static int set_global_limit(const char *val, struct kernel_param *kp)
|
||||
static int set_global_limit(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int rv;
|
||||
|
||||
|
|
|
@ -602,7 +602,7 @@ static struct ctl_table nlm_sysctl_root[] = {
|
|||
*/
|
||||
|
||||
#define param_set_min_max(name, type, which_strtol, min, max) \
|
||||
static int param_set_##name(const char *val, struct kernel_param *kp) \
|
||||
static int param_set_##name(const char *val, const struct kernel_param *kp) \
|
||||
{ \
|
||||
char *endp; \
|
||||
__typeof__(type) num = which_strtol(val, &endp, 0); \
|
||||
|
|
|
@ -88,13 +88,13 @@ struct workqueue_struct *user_dlm_worker;
|
|||
*/
|
||||
#define DLMFS_CAPABILITIES "bast stackglue"
|
||||
static int param_set_dlmfs_capabilities(const char *val,
|
||||
struct kernel_param *kp)
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
printk(KERN_ERR "%s: readonly parameter\n", kp->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
static int param_get_dlmfs_capabilities(char *buffer,
|
||||
struct kernel_param *kp)
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
return strlcpy(buffer, DLMFS_CAPABILITIES,
|
||||
strlen(DLMFS_CAPABILITIES) + 1);
|
||||
|
|
|
@ -228,19 +228,11 @@ struct kparam_array
|
|||
VERIFY_OCTAL_PERMISSIONS(perm), level, flags, { arg } }
|
||||
|
||||
/* Obsolete - use module_param_cb() */
|
||||
#define module_param_call(name, set, get, arg, perm) \
|
||||
#define module_param_call(name, _set, _get, arg, perm) \
|
||||
static const struct kernel_param_ops __param_ops_##name = \
|
||||
{ .flags = 0, (void *)set, (void *)get }; \
|
||||
{ .flags = 0, .set = _set, .get = _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);
|
||||
|
|
|
@ -285,7 +285,7 @@ static inline bool nf_ct_should_gc(const struct nf_conn *ct)
|
|||
|
||||
struct kernel_param;
|
||||
|
||||
int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);
|
||||
int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp);
|
||||
int nf_conntrack_hash_resize(unsigned int hashsize);
|
||||
|
||||
extern struct hlist_nulls_head *nf_conntrack_hash;
|
||||
|
|
|
@ -847,10 +847,8 @@ static int add_module_usage(struct module *a, struct module *b)
|
|||
|
||||
pr_debug("Allocating new usage for %s.\n", a->name);
|
||||
use = kmalloc(sizeof(*use), GFP_ATOMIC);
|
||||
if (!use) {
|
||||
pr_warn("%s: out of memory loading\n", a->name);
|
||||
if (!use)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
use->source = a;
|
||||
use->target = b;
|
||||
|
|
|
@ -1945,7 +1945,7 @@ int nf_conntrack_hash_resize(unsigned int hashsize)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)
|
||||
int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
unsigned int hashsize;
|
||||
int rc;
|
||||
|
|
|
@ -134,7 +134,7 @@ static int __init nf_nat_ftp_init(void)
|
|||
}
|
||||
|
||||
/* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */
|
||||
static int warn_set(const char *val, struct kernel_param *kp)
|
||||
static int warn_set(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
printk(KERN_INFO KBUILD_MODNAME
|
||||
": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
|
||||
|
|
|
@ -106,7 +106,7 @@ static int __init nf_nat_irc_init(void)
|
|||
}
|
||||
|
||||
/* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */
|
||||
static int warn_set(const char *val, struct kernel_param *kp)
|
||||
static int warn_set(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
printk(KERN_INFO KBUILD_MODNAME
|
||||
": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -813,11 +813,11 @@ static const struct kernel_param_ops param_ops_aalockpolicy = {
|
|||
.get = param_get_aalockpolicy
|
||||
};
|
||||
|
||||
static int param_set_audit(const char *val, struct kernel_param *kp);
|
||||
static int param_get_audit(char *buffer, struct kernel_param *kp);
|
||||
static int param_set_audit(const char *val, const struct kernel_param *kp);
|
||||
static int param_get_audit(char *buffer, const struct kernel_param *kp);
|
||||
|
||||
static int param_set_mode(const char *val, struct kernel_param *kp);
|
||||
static int param_get_mode(char *buffer, struct kernel_param *kp);
|
||||
static int param_set_mode(const char *val, const struct kernel_param *kp);
|
||||
static int param_get_mode(char *buffer, const struct kernel_param *kp);
|
||||
|
||||
/* Flag values, also controllable via /sys/module/apparmor/parameters
|
||||
* We define special types as we want to do additional mediation.
|
||||
|
@ -951,7 +951,7 @@ static int param_get_aauint(char *buffer, const struct kernel_param *kp)
|
|||
return param_get_uint(buffer, kp);
|
||||
}
|
||||
|
||||
static int param_get_audit(char *buffer, struct kernel_param *kp)
|
||||
static int param_get_audit(char *buffer, const struct kernel_param *kp)
|
||||
{
|
||||
if (!apparmor_enabled)
|
||||
return -EINVAL;
|
||||
|
@ -960,7 +960,7 @@ static int param_get_audit(char *buffer, struct kernel_param *kp)
|
|||
return sprintf(buffer, "%s", audit_mode_names[aa_g_audit]);
|
||||
}
|
||||
|
||||
static int param_set_audit(const char *val, struct kernel_param *kp)
|
||||
static int param_set_audit(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
@ -981,7 +981,7 @@ static int param_set_audit(const char *val, struct kernel_param *kp)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int param_get_mode(char *buffer, struct kernel_param *kp)
|
||||
static int param_get_mode(char *buffer, const struct kernel_param *kp)
|
||||
{
|
||||
if (!apparmor_enabled)
|
||||
return -EINVAL;
|
||||
|
@ -991,7 +991,7 @@ static int param_get_mode(char *buffer, struct kernel_param *kp)
|
|||
return sprintf(buffer, "%s", aa_profile_mode_names[aa_g_profile_mode]);
|
||||
}
|
||||
|
||||
static int param_set_mode(const char *val, struct kernel_param *kp)
|
||||
static int param_set_mode(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
Loading…
Reference in New Issue