Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea606cf5 authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Linus Torvalds
Browse files

mm: move max_map_count bits into mm.h 



max_map_count sysctl unrelated to scheduler. Move its bits from
include/linux/sched/sysctl.h to include/linux/mm.h.

Signed-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f9719a03

include/linux/mm.h

+21 −0
Original line number Diff line number Diff line
@@ -82,6 +82,27 @@ extern int mmap_rnd_compat_bits __read_mostly; 
#define mm_forbids_zeropage(X)	(0)

#endif



/*

 * Default maximum number of active map areas, this limits the number of vmas

 * per mm struct. Users can overwrite this number by sysctl but there is a

 * problem.

 *

 * When a program's coredump is generated as ELF format, a section is created

 * per a vma. In ELF, the number of sections is represented in unsigned short.

 * This means the number of sections should be smaller than 65535 at coredump.

 * Because the kernel adds some informative sections to a image of program at

 * generating coredump, we need some margin. The number of extra sections is

 * 1-3 now and depends on arch. We use "5" as safe margin, here.

 *

 * ELF extended numbering allows more than 65535 sections, so 16-bit bound is

 * not a hard limit any more. Although some userspace tools can be surprised by

 * that.

 */

#define MAPCOUNT_ELF_CORE_MARGIN	(5)

#define DEFAULT_MAX_MAP_COUNT	(USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)



extern int sysctl_max_map_count;



extern unsigned long sysctl_user_reserve_kbytes;

extern unsigned long sysctl_admin_reserve_kbytes;

include/linux/sched/sysctl.h

+0 −21
Original line number Diff line number Diff line
@@ -14,27 +14,6 @@ extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write, 
enum { sysctl_hung_task_timeout_secs = 0 };

#endif



/*

 * Default maximum number of active map areas, this limits the number of vmas

 * per mm struct. Users can overwrite this number by sysctl but there is a

 * problem.

 *

 * When a program's coredump is generated as ELF format, a section is created

 * per a vma. In ELF, the number of sections is represented in unsigned short.

 * This means the number of sections should be smaller than 65535 at coredump.

 * Because the kernel adds some informative sections to a image of program at

 * generating coredump, we need some margin. The number of extra sections is

 * 1-3 now and depends on arch. We use "5" as safe margin, here.

 *

 * ELF extended numbering allows more than 65535 sections, so 16-bit bound is

 * not a hard limit any more. Although some userspace tools can be surprised by

 * that.

 */

#define MAPCOUNT_ELF_CORE_MARGIN	(5)

#define DEFAULT_MAX_MAP_COUNT	(USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)



extern int sysctl_max_map_count;



extern unsigned int sysctl_sched_latency;

extern unsigned int sysctl_sched_min_granularity;

extern unsigned int sysctl_sched_wakeup_granularity;

mm/mmap.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <linux/khugepaged.h>

#include <linux/uprobes.h>

#include <linux/rbtree_augmented.h>

#include <linux/sched/sysctl.h>

#include <linux/notifier.h>

#include <linux/memory.h>

#include <linux/printk.h>

mm/mremap.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/security.h>

#include <linux/syscalls.h>

#include <linux/mmu_notifier.h>

#include <linux/sched/sysctl.h>

#include <linux/uaccess.h>

#include <linux/mm-arch-hooks.h>

mm/nommu.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/security.h>

#include <linux/syscalls.h>

#include <linux/audit.h>

#include <linux/sched/sysctl.h>

#include <linux/printk.h>



#include <asm/uaccess.h>