From: Yuval Shaia Date: Mon, 30 May 2016 10:23:28 +0000 (-0700) Subject: {IB/{core,ipoib},net/{mlx4,rds}}: Mark unload_allowed as __initdata variable X-Git-Tag: v4.1.12-92~90^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fcdaab66c70ba4b02c7642768cda8183c3929773;p=users%2Fjedix%2Flinux-maple.git {IB/{core,ipoib},net/{mlx4,rds}}: Mark unload_allowed as __initdata variable Replacing __read_mostly directive with __initdata since this variable is used only during module initialization. Module parameter permissions are changed accordingly. Orabug: 23501273 Signed-off-by: Yuval Shaia Reviewed-by: Shamir Rabinovitch Reviewed-By: Wengang Wang Reviewed-by: Santosh Shilimkar --- diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index bb5b2f6ce44a..7b60cc0b0e19 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -46,9 +46,9 @@ MODULE_AUTHOR("Roland Dreier"); MODULE_DESCRIPTION("core kernel InfiniBand API"); MODULE_LICENSE("Dual BSD/GPL"); -int unload_allowed __read_mostly = 1; +int unload_allowed __initdata = 1; -module_param_named(module_unload_allowed, unload_allowed, int, 0444); +module_param_named(module_unload_allowed, unload_allowed, int, 0); MODULE_PARM_DESC(module_unload_allowed, "Allow this module to be unloaded or not (default 1 for YES)"); struct ib_client_data { diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 721a6eacad97..d4e9ac7b22d6 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -61,7 +61,6 @@ MODULE_VERSION(DRV_VERSION); int ipoib_sendq_size __read_mostly = IPOIB_TX_RING_SIZE; int ipoib_recvq_size __read_mostly = IPOIB_RX_RING_SIZE; -int unload_allowed __read_mostly = 1; /* IPOIB_CM_MAX_BAD_CONNS default value (8) is inline with current * Exadata-ZFS deployment. * We usually have 2 ZFS heads in current deployment. @@ -73,8 +72,9 @@ int unload_allowed __read_mostly = 1; */ int ipoib_cm_sendq_size __read_mostly = IPOIB_TX_RING_SIZE / IPOIB_CM_MAX_BAD_CONNS; int ipoib_cm_max_bad_conns = IPOIB_CM_MAX_BAD_CONNS; +int unload_allowed __initdata = 1; -module_param_named(module_unload_allowed, unload_allowed, int, 0444); +module_param_named(module_unload_allowed, unload_allowed, int, 0); MODULE_PARM_DESC(module_unload_allowed, "Allow this module to be unloaded or not (default 1 for YES)"); module_param_named(send_queue_size, ipoib_sendq_size, int, 0444); diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index e5163b8d76de..9323ef75a13a 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -65,8 +65,8 @@ MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0"); #endif /* CONFIG_MLX4_DEBUG */ -int unload_allowed __read_mostly; -module_param_named(module_unload_allowed, unload_allowed, int, 0444); +int unload_allowed __initdata; +module_param_named(module_unload_allowed, unload_allowed, int, 0); MODULE_PARM_DESC(module_unload_allowed, "Allow this module to be unloaded or not (default 0 for NO)"); #ifdef CONFIG_PCI_MSI diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c index 453e6dd99005..eeac3981c58e 100644 --- a/net/rds/rdma_transport.c +++ b/net/rds/rdma_transport.c @@ -43,9 +43,9 @@ #define RDS_REJ_CONSUMER_DEFINED 28 -int unload_allowed __read_mostly; +int unload_allowed __initdata; -module_param_named(module_unload_allowed, unload_allowed, int, 0444); +module_param_named(module_unload_allowed, unload_allowed, int, 0); MODULE_PARM_DESC(module_unload_allowed, "Allow this module to be unloaded or not (default 0 for NO)"); int rds_rdma_resolve_to_ms[] = {1000, 1000, 2000, 4000, 5000};