Update of /cvsroot/linux-vax/kernel-2.5/init
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12986/init
Modified Files:
Makefile Kconfig
Log Message:
Merge with 2.6.11
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 21 Mar 2005 18:58:04 -0000 1.3
+++ Makefile 27 Mar 2005 23:46:45 -0000 1.4
@@ -3,6 +3,8 @@
#
obj-y := main.o version.o mounts.o initramfs.o
+obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
+
mounts-y := do_mounts.o
mounts-$(CONFIG_DEVFS_FS) += do_mounts_devfs.o
mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o
Index: Kconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig 21 Mar 2005 23:44:18 -0000 1.3
+++ Kconfig 27 Mar 2005 23:46:45 -0000 1.4
@@ -206,20 +206,9 @@
bool "Support for hot-pluggable devices" if !ARCH_S390
default ARCH_S390
help
- Say Y here if you want to plug devices into your computer while
- the system is running, and be able to use them quickly. In many
- cases, the devices can likewise be unplugged at any time too.
-
- One well known example of this is PCMCIA- or PC-cards, credit-card
- size devices such as network cards, modems or hard drives which are
- plugged into slots found on all modern laptop computers. Another
- example, used on modern desktops as well as laptops, is USB.
-
- Enable HOTPLUG and KMOD, and build a modular kernel. Get agent
- software (at <http://linux-hotplug.sourceforge.net/>) and install it.
- Then your kernel will automatically call out to a user mode "policy
- agent" (/sbin/hotplug) to load modules and set up software needed
- to use devices as you hotplug them.
+ This option is provided for the case where no in-kernel-tree
+ modules require HOTPLUG functionality, but a module built
+ outside the kernel tree does. Such modules require Y here.
config KOBJECT_UEVENT
bool "Kernel Userspace Events"
@@ -327,8 +316,9 @@
If unsure, say N.
config SHMEM
+ bool "Use full shmem filesystem" if EMBEDDED
default y
- bool "Use full shmem filesystem" if EMBEDDED && MMU
+ depends on MMU
help
The shmem is an internal filesystem used to manage shared memory.
It is backed by swap and manages resource limits. It is also exported
@@ -431,7 +421,7 @@
config MODVERSIONS
bool "Module versioning support (EXPERIMENTAL)"
- depends on MODULES && EXPERIMENTAL
+ depends on MODULES && EXPERIMENTAL && !USERMODE
help
Usually, you have to use modules compiled with your kernel.
Saying Y here makes it sometimes possible to use modules
|
