diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 10 | ||||
-rw-r--r-- | init/do_mounts.c | 4 |
2 files changed, 4 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 | |||
779 | 779 | ||
780 | source "arch/Kconfig" | 780 | source "arch/Kconfig" |
781 | 781 | ||
782 | config PROC_PAGE_MONITOR | ||
783 | default y | ||
784 | depends on PROC_FS && MMU | ||
785 | bool "Enable /proc page monitoring" if EMBEDDED | ||
786 | help | ||
787 | Various /proc files exist to monitor process memory utilization: | ||
788 | /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap, | ||
789 | /proc/kpagecount, and /proc/kpageflags. Disabling these | ||
790 | interfaces will reduce the size of the kernel by approximately 4kb. | ||
791 | |||
792 | endmenu # General setup | 782 | endmenu # General setup |
793 | 783 | ||
794 | config HAVE_GENERIC_DMA_COHERENT | 784 | config HAVE_GENERIC_DMA_COHERENT |
diff --git a/init/do_mounts.c b/init/do_mounts.c index 3715feb8446d..d055b1914c3d 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
@@ -263,6 +263,10 @@ retry: | |||
263 | printk("Please append a correct \"root=\" boot option; here are the available partitions:\n"); | 263 | printk("Please append a correct \"root=\" boot option; here are the available partitions:\n"); |
264 | 264 | ||
265 | printk_all_partitions(); | 265 | printk_all_partitions(); |
266 | #ifdef CONFIG_DEBUG_BLOCK_EXT_DEVT | ||
267 | printk("DEBUG_BLOCK_EXT_DEVT is enabled, you need to specify " | ||
268 | "explicit textual name for \"root=\" boot option.\n"); | ||
269 | #endif | ||
266 | panic("VFS: Unable to mount root fs on %s", b); | 270 | panic("VFS: Unable to mount root fs on %s", b); |
267 | } | 271 | } |
268 | 272 | ||