Merge commit 'v2.6.27-rc8' into x86/setup

author: Ingo Molnar <mingo@elte.hu> 2008-10-03 13:28:46 -0400
committer: Ingo Molnar <mingo@elte.hu> 2008-10-03 13:28:46 -0400
commit: f68ec0c24755e5cdb779be6240925f2175311d84 (patch)
tree: a7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /init/Kconfig
parent: 98920dc3d1113b883cbc73e3293446d3525c6042 (diff)
parent: 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff)
1 files changed, 17 insertions, 30 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 6199d1120900..c11da38837e5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -171,7 +171,7 @@ config BSD_PROCESS_ACCT_V3
          process and it's parent. Note that this file format is incompatible
          with previous v0/v1/v2 file formats, so you will need updated tools
          for processing it. A preliminary version of these tools is available
-          at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
+          at <http://www.gnu.org/software/acct/>.
 config TASKSTATS
        bool "Export task/process statistics through netlink (EXPERIMENTAL)"
@@ -486,7 +486,7 @@ config PID_NS
        default n
        depends on NAMESPACES && EXPERIMENTAL
        help
-          Suport process id namespaces.  This allows having multiple
+          Support process id namespaces.  This allows having multiple
          process with the same pid as long as they are in different
          pid namespaces.  This is a building block of containers.
@@ -522,7 +522,7 @@ config CC_OPTIMIZE_FOR_SIZE
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
-          If unsure, say N.
+          If unsure, say Y.
 config SYSCTL
        bool
@@ -558,17 +558,6 @@ config SYSCTL_SYSCALL
          If unsure say Y here.
-config SYSCTL_SYSCALL_CHECK
-        bool "Sysctl checks" if EMBEDDED
-        depends on SYSCTL_SYSCALL
-        default y
-        ---help---
-          sys_sysctl uses binary paths that have been found challenging
-          to properly maintain and use. This enables checks that help
-          you to keep things correct.
-          If unsure say Y here.
 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EMBEDDED
         default y
@@ -802,6 +791,10 @@ config PROC_PAGE_MONITOR
 endmenu         # General setup
+config HAVE_GENERIC_DMA_COHERENT
+        bool
+        default n
 config SLABINFO
        bool
        depends on PROC_FS
@@ -841,9 +834,10 @@ menuconfig MODULES
          If unsure, say Y.
+if MODULES
 config MODULE_FORCE_LOAD
        bool "Forced module loading"
-        depends on MODULES
        default n
        help
          Allow loading of modules without version information (ie. modprobe
@@ -852,12 +846,11 @@ config MODULE_FORCE_LOAD
 config MODULE_UNLOAD
        bool "Module unloading"
-        depends on MODULES
        help
          Without this option you will not be able to unload any
          modules (note that some modules may not be unloadable
-          anyway), which makes your kernel slightly smaller and
+          anyway), which makes your kernel smaller, faster
-          simpler.  If unsure, say Y.
+          and simpler.  If unsure, say Y.
 config MODULE_FORCE_UNLOAD
        bool "Forced module unloading"
@@ -871,7 +864,6 @@ config MODULE_FORCE_UNLOAD
 config MODVERSIONS
        bool "Module versioning support"
-        depends on MODULES
        help
          Usually, you have to use modules compiled with your kernel.
          Saying Y here makes it sometimes possible to use modules
@@ -882,7 +874,6 @@ config MODVERSIONS
 config MODULE_SRCVERSION_ALL
        bool "Source checksum for all modules"
-        depends on MODULES
        help
          Modules which contain a MODULE_VERSION get an extra "srcversion"
          field inserted into their modinfo section, which contains a
@@ -893,16 +884,12 @@ config MODULE_SRCVERSION_ALL
          will be created for all modules.  If unsure, say N.
 config KMOD
-        bool "Automatic kernel module loading"
+        def_bool y
-        depends on MODULES
+        help
-        help
+          This is being removed soon.  These days, CONFIG_MODULES
-          Normally when you have selected some parts of the kernel to
+          implies CONFIG_KMOD, so use that instead.
-          be created as kernel modules, you must load them (using the
-          "modprobe" command) before you can use them. If you say Y
+endif # MODULES
-          here, some parts of the kernel will be able to load modules
-          automatically: when a part of the kernel needs a module, it
-          runs modprobe with the appropriate arguments, thereby
-          loading the module if it is available.  If unsure, say Y.
 config STOP_MACHINE
        bool
author	Ingo Molnar <mingo@elte.hu>	2008-10-03 13:28:46 -0400
committer	Ingo Molnar <mingo@elte.hu>	2008-10-03 13:28:46 -0400
commit	f68ec0c24755e5cdb779be6240925f2175311d84 (patch)
tree	a7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /init/Kconfig
parent	98920dc3d1113b883cbc73e3293446d3525c6042 (diff)
parent	94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff)

diff --git a/init/Kconfig b/init/Kconfig index 6199d1120900..c11da38837e5 100644 --- a/init/Kconfig +++ b/init/Kconfig
@@ -171,7 +171,7 @@ config BSD_PROCESS_ACCT_V3
171	process and it's parent. Note that this file format is incompatible	171	process and it's parent. Note that this file format is incompatible
172	with previous v0/v1/v2 file formats, so you will need updated tools	172	with previous v0/v1/v2 file formats, so you will need updated tools
173	for processing it. A preliminary version of these tools is available	173	for processing it. A preliminary version of these tools is available
174	at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.	174	at <http://www.gnu.org/software/acct/>.
175		175
176	config TASKSTATS	176	config TASKSTATS
177	bool "Export task/process statistics through netlink (EXPERIMENTAL)"	177	bool "Export task/process statistics through netlink (EXPERIMENTAL)"
@@ -486,7 +486,7 @@ config PID_NS
486	default n	486	default n
487	depends on NAMESPACES && EXPERIMENTAL	487	depends on NAMESPACES && EXPERIMENTAL
488	help	488	help
489	Suport process id namespaces. This allows having multiple	489	Support process id namespaces. This allows having multiple
490	process with the same pid as long as they are in different	490	process with the same pid as long as they are in different
491	pid namespaces. This is a building block of containers.	491	pid namespaces. This is a building block of containers.
492		492
@@ -522,7 +522,7 @@ config CC_OPTIMIZE_FOR_SIZE
522	Enabling this option will pass "-Os" instead of "-O2" to gcc	522	Enabling this option will pass "-Os" instead of "-O2" to gcc
523	resulting in a smaller kernel.	523	resulting in a smaller kernel.
524		524
525	If unsure, say N.	525	If unsure, say Y.
526		526
527	config SYSCTL	527	config SYSCTL
528	bool	528	bool
@@ -558,17 +558,6 @@ config SYSCTL_SYSCALL
558		558
559	If unsure say Y here.	559	If unsure say Y here.
560		560
561	config SYSCTL_SYSCALL_CHECK
562	bool "Sysctl checks" if EMBEDDED
563	depends on SYSCTL_SYSCALL
564	default y
565	---help---
566	sys_sysctl uses binary paths that have been found challenging
567	to properly maintain and use. This enables checks that help
568	you to keep things correct.
569
570	If unsure say Y here.
571
572	config KALLSYMS	561	config KALLSYMS
573	bool "Load all symbols for debugging/ksymoops" if EMBEDDED	562	bool "Load all symbols for debugging/ksymoops" if EMBEDDED
574	default y	563	default y
@@ -802,6 +791,10 @@ config PROC_PAGE_MONITOR
802		791
803	endmenu # General setup	792	endmenu # General setup
804		793
		794	config HAVE_GENERIC_DMA_COHERENT
		795	bool
		796	default n
		797
805	config SLABINFO	798	config SLABINFO
806	bool	799	bool
807	depends on PROC_FS	800	depends on PROC_FS
@@ -841,9 +834,10 @@ menuconfig MODULES
841		834
842	If unsure, say Y.	835	If unsure, say Y.
843		836
		837	if MODULES
		838
844	config MODULE_FORCE_LOAD	839	config MODULE_FORCE_LOAD
845	bool "Forced module loading"	840	bool "Forced module loading"
846	depends on MODULES
847	default n	841	default n
848	help	842	help
849	Allow loading of modules without version information (ie. modprobe	843	Allow loading of modules without version information (ie. modprobe
@@ -852,12 +846,11 @@ config MODULE_FORCE_LOAD
852		846
853	config MODULE_UNLOAD	847	config MODULE_UNLOAD
854	bool "Module unloading"	848	bool "Module unloading"
855	depends on MODULES
856	help	849	help
857	Without this option you will not be able to unload any	850	Without this option you will not be able to unload any
858	modules (note that some modules may not be unloadable	851	modules (note that some modules may not be unloadable
859	anyway), which makes your kernel slightly smaller and	852	anyway), which makes your kernel smaller, faster
860	simpler. If unsure, say Y.	853	and simpler. If unsure, say Y.
861		854
862	config MODULE_FORCE_UNLOAD	855	config MODULE_FORCE_UNLOAD
863	bool "Forced module unloading"	856	bool "Forced module unloading"
@@ -871,7 +864,6 @@ config MODULE_FORCE_UNLOAD
871		864
872	config MODVERSIONS	865	config MODVERSIONS
873	bool "Module versioning support"	866	bool "Module versioning support"
874	depends on MODULES
875	help	867	help
876	Usually, you have to use modules compiled with your kernel.	868	Usually, you have to use modules compiled with your kernel.
877	Saying Y here makes it sometimes possible to use modules	869	Saying Y here makes it sometimes possible to use modules
@@ -882,7 +874,6 @@ config MODVERSIONS
882		874
883	config MODULE_SRCVERSION_ALL	875	config MODULE_SRCVERSION_ALL
884	bool "Source checksum for all modules"	876	bool "Source checksum for all modules"
885	depends on MODULES
886	help	877	help
887	Modules which contain a MODULE_VERSION get an extra "srcversion"	878	Modules which contain a MODULE_VERSION get an extra "srcversion"
888	field inserted into their modinfo section, which contains a	879	field inserted into their modinfo section, which contains a
@@ -893,16 +884,12 @@ config MODULE_SRCVERSION_ALL
893	will be created for all modules. If unsure, say N.	884	will be created for all modules. If unsure, say N.
894		885
895	config KMOD	886	config KMOD
896	bool "Automatic kernel module loading"	887	def_bool y
897	depends on MODULES	888	help
898	help	889	This is being removed soon. These days, CONFIG_MODULES
899	Normally when you have selected some parts of the kernel to	890	implies CONFIG_KMOD, so use that instead.
900	be created as kernel modules, you must load them (using the	891
901	"modprobe" command) before you can use them. If you say Y	892	endif # MODULES
902	here, some parts of the kernel will be able to load modules
903	automatically: when a part of the kernel needs a module, it
904	runs modprobe with the appropriate arguments, thereby
905	loading the module if it is available. If unsure, say Y.
906		893
907	config STOP_MACHINE	894	config STOP_MACHINE
908	bool	895	bool