Commit 851911aa authored by Joel Granados's avatar Joel Granados
Browse files

mm: move randomize_va_space into memory.c 



Move the randomize_va_space variable together with all its sysctl table
elements into memory.c. Register it to the "kernel" directory by
adding it to the subsys initialization calls

This is part of a greater effort to move ctl tables into their
respective subsystems which will reduce the merge conflicts in
kernel/sysctl.c.

Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarKees Cook <kees@kernel.org>
Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent fff6703f

kernel/sysctl.c

+0 −9
Original line number Diff line number Diff line
@@ -1688,15 +1688,6 @@ static const struct ctl_table kern_table[] = { 
		.proc_handler	= proc_dointvec,

	},

#endif

#if defined(CONFIG_MMU)

	{

		.procname	= "randomize_va_space",

		.data		= &randomize_va_space,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

#endif

#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN

	{

		.procname	= "ignore-unaligned-usertrap",

mm/memory.c

+18 −0
Original line number Diff line number Diff line
@@ -125,6 +125,24 @@ int randomize_va_space __read_mostly = 
					2;

#endif



static const struct ctl_table mmu_sysctl_table[] = {

	{

		.procname	= "randomize_va_space",

		.data		= &randomize_va_space,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

};



static int __init init_mm_sysctl(void)

{

	register_sysctl_init("kernel", mmu_sysctl_table);

	return 0;

}



subsys_initcall(init_mm_sysctl);



#ifndef arch_wants_old_prefaulted_pte

static inline bool arch_wants_old_prefaulted_pte(void)

{