diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-14 17:34:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-14 17:34:23 +0200 |
| commit | c2d98093cf3fd7a9ef34b1ae9aa12a4a5b061872 (patch) | |
| tree | dc46ce4b127880c97c37d0c933ed2201ee0e838b /init | |
| parent | 5b6afd95f89d6884623028a89088f2652a6c56e0 (diff) | |
| parent | 7591103c08abade60aeddb432ed0686ddd0de1c6 (diff) | |
Merge branch 'linus' into stackprotector
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/init/Kconfig b/init/Kconfig index c11da38837e5..8a8e2d00c40e 100644 --- a/init/Kconfig +++ b/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 |