diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 10:04:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 10:04:04 -0700 |
| commit | 20272c8994cf1e1f8ed745a2ea161dd9ad3889f2 (patch) | |
| tree | 96b1bf44be94e7e85bb2bf5b2b87a4dbd452ecde /init | |
| parent | 8d71ff0bef9cf4e70108a9a2762f2361e607abde (diff) | |
| parent | 3bbfe0596746e1590888a6e1e6a07583265238b7 (diff) | |
| download | lwn-20272c8994cf1e1f8ed745a2ea161dd9ad3889f2.tar.gz lwn-20272c8994cf1e1f8ed745a2ea161dd9ad3889f2.zip | |
Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
* 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
proc: remove kernel.maps_protect
proc: remove now unneeded ADDBUF macro
[PATCH] proc: show personality via /proc/pid/personality
[PATCH] signal, procfs: some lock_task_sighand() users do not need rcu_read_lock()
proc: move PROC_PAGE_MONITOR to fs/proc/Kconfig
proc: make grab_header() static
proc: remove unused get_dma_list()
proc: remove dummy vmcore_open()
proc: proc_sys_root tweak
proc: fix return value of proc_reg_open() in "too late" case
Fixed up trivial conflict in removed file arch/sparc/include/asm/dma_32.h
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 |