Commit b4856250 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'constfy-sysctl-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl 

Pull sysctl constification from Joel Granados:
 "Treewide constification of the ctl_table argument of proc_handlers
  using a coccinelle script and some manual code formatting fixups.

  This is a prerequisite to moving the static ctl_table structs into
  read-only data section which will ensure that proc_handler function
  pointers cannot be modified"

* tag 'constfy-sysctl-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
  sysctl: treewide: constify the ctl_table argument of proc_handlers
parents bba959f4 78eb4ea2

arch/arm64/kernel/armv8_deprecated.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int update_insn_emulation_mode(struct insn_emulation *insn, 
	return ret;

}



static int emulation_proc_handler(struct ctl_table *table, int write,

static int emulation_proc_handler(const struct ctl_table *table, int write,

				  void *buffer, size_t *lenp,

				  loff_t *ppos)

{

arch/arm64/kernel/fpsimd.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static unsigned int find_supported_vector_length(enum vec_type type, 


#if defined(CONFIG_ARM64_SVE) && defined(CONFIG_SYSCTL)



static int vec_proc_do_default_vl(struct ctl_table *table, int write,

static int vec_proc_do_default_vl(const struct ctl_table *table, int write,

				  void *buffer, size_t *lenp, loff_t *ppos)

{

	struct vl_info *info = table->extra1;

arch/s390/appldata/appldata_base.c

+5 −5
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ 
 * /proc entries (sysctl)

 */

static const char appldata_proc_name[APPLDATA_PROC_NAME_LENGTH] = "appldata";

static int appldata_timer_handler(struct ctl_table *ctl, int write,

static int appldata_timer_handler(const struct ctl_table *ctl, int write,

				  void *buffer, size_t *lenp, loff_t *ppos);

static int appldata_interval_handler(struct ctl_table *ctl, int write,

static int appldata_interval_handler(const struct ctl_table *ctl, int write,

				     void *buffer, size_t *lenp, loff_t *ppos);



static struct ctl_table_header *appldata_sysctl_header;
@@ -199,7 +199,7 @@ static void __appldata_vtimer_setup(int cmd) 
 * Start/Stop timer, show status of timer (0 = not active, 1 = active)

 */

static int

appldata_timer_handler(struct ctl_table *ctl, int write,

appldata_timer_handler(const struct ctl_table *ctl, int write,

			   void *buffer, size_t *lenp, loff_t *ppos)

{

	int timer_active = appldata_timer_active;
@@ -232,7 +232,7 @@ appldata_timer_handler(struct ctl_table *ctl, int write, 
 * current timer interval.

 */

static int

appldata_interval_handler(struct ctl_table *ctl, int write,

appldata_interval_handler(const struct ctl_table *ctl, int write,

			   void *buffer, size_t *lenp, loff_t *ppos)

{

	int interval = appldata_interval;
@@ -262,7 +262,7 @@ appldata_interval_handler(struct ctl_table *ctl, int write, 
 * monitoring (0 = not in process, 1 = in process)

 */

static int

appldata_generic_handler(struct ctl_table *ctl, int write,

appldata_generic_handler(const struct ctl_table *ctl, int write,

			   void *buffer, size_t *lenp, loff_t *ppos)

{

	struct appldata_ops *ops = NULL, *tmp_ops;

arch/s390/kernel/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ static int debug_active = 1; 
 * always allow read, allow write only if debug_stoppable is set or

 * if debug_active is already off

 */

static int s390dbf_procactive(struct ctl_table *table, int write,

static int s390dbf_procactive(const struct ctl_table *table, int write,

			      void *buffer, size_t *lenp, loff_t *ppos)

{

	if (!write || debug_stoppable || !debug_active)

arch/s390/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static int __init topology_setup(char *str) 
}

early_param("topology", topology_setup);



static int topology_ctl_handler(struct ctl_table *ctl, int write,

static int topology_ctl_handler(const struct ctl_table *ctl, int write,

				void *buffer, size_t *lenp, loff_t *ppos)

{

	int enabled = topology_is_enabled();