diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 27 | ||||
| -rw-r--r-- | init/do_mounts.c | 13 |
2 files changed, 30 insertions, 10 deletions
diff --git a/init/Kconfig b/init/Kconfig index 4381006dd66..f7a04d0daf0 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -92,7 +92,7 @@ config LOCALVERSION_AUTO config SWAP bool "Support for paging of anonymous memory (swap)" - depends on MMU + depends on MMU && BLOCK default y help This option allows you to choose whether you want to have support @@ -202,7 +202,7 @@ config AUDITSYSCALL ensure that INOTIFY is configured. config IKCONFIG - bool "Kernel .config support" + tristate "Kernel .config support" ---help--- This option enables the complete Linux kernel ".config" file contents to be saved in the kernel. It provides documentation @@ -257,6 +257,18 @@ config CC_OPTIMIZE_FOR_SIZE If unsure, say N. +config TASK_XACCT + bool "Enable extended accounting over taskstats (EXPERIMENTAL)" + depends on TASKSTATS + help + Collect extended task accounting data and send the data + to userland for processing over the taskstats interface. + + Say N if unsure. + +config SYSCTL + bool + menuconfig EMBEDDED bool "Configure standard kernel features (for small systems)" help @@ -272,11 +284,8 @@ config UID16 help This enables the legacy 16-bit UID syscall wrappers. -config SYSCTL - bool - config SYSCTL_SYSCALL - bool "Sysctl syscall support" + bool "Sysctl syscall support" if EMBEDDED default n select SYSCTL ---help--- @@ -285,11 +294,11 @@ config SYSCTL_SYSCALL and use. The interface in /proc/sys is now the primary and what everyone uses. - Nothing has been using the binary sysctl interface for some time + Nothing has been using the binary sysctl interface for some time now so nothing should break if you disable sysctl syscall - support, and you kernel will get marginally smaller. + support, and your kernel will get marginally smaller. - Unless you have an application that uses the sys_syscall interface + Unless you have an application that uses the sys_sysctl interface you should probably say N here. config KALLSYMS diff --git a/init/do_mounts.c b/init/do_mounts.c index b290aadb1d3..dc1ec0803ef 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -285,7 +285,11 @@ void __init mount_block_root(char *name, int flags) { char *fs_names = __getname(); char *p; +#ifdef CONFIG_BLOCK char b[BDEVNAME_SIZE]; +#else + const char *b = name; +#endif get_fs_names(fs_names); retry: @@ -304,7 +308,9 @@ retry: * Allow the user to distinguish between failed sys_open * and bad superblock on root device. */ +#ifdef CONFIG_BLOCK __bdevname(ROOT_DEV, b); +#endif printk("VFS: Cannot open root device \"%s\" or %s\n", root_device_name, b); printk("Please append a correct \"root=\" boot option\n"); @@ -316,7 +322,10 @@ retry: for (p = fs_names; *p; p += strlen(p)+1) printk(" %s", p); printk("\n"); - panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV, b)); +#ifdef CONFIG_BLOCK + __bdevname(ROOT_DEV, b); +#endif + panic("VFS: Unable to mount root fs on %s", b); out: putname(fs_names); } @@ -387,8 +396,10 @@ void __init mount_root(void) change_floppy("root floppy"); } #endif +#ifdef CONFIG_BLOCK create_dev("/dev/root", ROOT_DEV); mount_block_root("/dev/root", root_mountflags); +#endif } /* |