diff --git a/[refs] b/[refs] index c5e9b35ca2fa..9d7337b565da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81324364b76eba592255d4b712e522f9fd8d25f4 +refs/heads/master: 53167a3ef23df561d898dee636f3393e9fba937c diff --git a/trunk/fs/proc/Kconfig b/trunk/fs/proc/Kconfig index 73cd7a418f06..50f8f0600f06 100644 --- a/trunk/fs/proc/Kconfig +++ b/trunk/fs/proc/Kconfig @@ -57,3 +57,13 @@ config PROC_SYSCTL As it is generally a good thing, you should say Y here unless building a kernel for install/rescue disks or your system is very limited in memory. + +config PROC_PAGE_MONITOR + default y + depends on PROC_FS && MMU + bool "Enable /proc page monitoring" if EMBEDDED + help + Various /proc files exist to monitor process memory utilization: + /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap, + /proc/kpagecount, and /proc/kpageflags. Disabling these + interfaces will reduce the size of the kernel by approximately 4kb. diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index c11da38837e5..8a8e2d00c40e 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -779,16 +779,6 @@ config MARKERS source "arch/Kconfig" -config PROC_PAGE_MONITOR - default y - depends on PROC_FS && MMU - bool "Enable /proc page monitoring" if EMBEDDED - help - Various /proc files exist to monitor process memory utilization: - /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap, - /proc/kpagecount, and /proc/kpageflags. Disabling these - interfaces will reduce the size of the kernel by approximately 4kb. - endmenu # General setup config HAVE_GENERIC_DMA_COHERENT