diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:05:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:05:51 -0500 |
commit | 06991c28f37ad68e5c03777f5c3b679b56e3dac1 (patch) | |
tree | 4be75788e21c3c644fe6d39abf47693a171cf4f8 /init/Kconfig | |
parent | 460dc1eecf37263c8e3b17685ef236f0d236facb (diff) | |
parent | 74fef7a8fd1d2bd94f925d6638bb4c3049e7c381 (diff) |
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman:
"Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers
all over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
Other than those patches, there's not much here, some minor fixes and
updates"
Fix up trivial conflicts
* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
base: memory: fix soft/hard_offline_page permissions
drivercore: Fix ordering between deferred_probe and exiting initcalls
backlight: fix class_find_device() arguments
TTY: mark tty_get_device call with the proper const values
driver-core: constify data for class_find_device()
firmware: Ignore abort check when no user-helper is used
firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
firmware: Make user-mode helper optional
firmware: Refactoring for splitting user-mode helper code
Driver core: treat unregistered bus_types as having no devices
watchdog: Convert to devm_ioremap_resource()
thermal: Convert to devm_ioremap_resource()
spi: Convert to devm_ioremap_resource()
power: Convert to devm_ioremap_resource()
mtd: Convert to devm_ioremap_resource()
mmc: Convert to devm_ioremap_resource()
mfd: Convert to devm_ioremap_resource()
media: Convert to devm_ioremap_resource()
iommu: Convert to devm_ioremap_resource()
drm: Convert to devm_ioremap_resource()
...
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 54 |
1 files changed, 12 insertions, 42 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7000d9657402..335a1f680c91 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -29,35 +29,8 @@ config BUILDTIME_EXTABLE_SORT | |||
29 | menu "General setup" | 29 | menu "General setup" |
30 | 30 | ||
31 | config EXPERIMENTAL | 31 | config EXPERIMENTAL |
32 | bool "Prompt for development and/or incomplete code/drivers" | 32 | bool |
33 | ---help--- | 33 | default y |
34 | Some of the various things that Linux supports (such as network | ||
35 | drivers, file systems, network protocols, etc.) can be in a state | ||
36 | of development where the functionality, stability, or the level of | ||
37 | testing is not yet high enough for general use. This is usually | ||
38 | known as the "alpha-test" phase among developers. If a feature is | ||
39 | currently in alpha-test, then the developers usually discourage | ||
40 | uninformed widespread use of this feature by the general public to | ||
41 | avoid "Why doesn't this work?" type mail messages. However, active | ||
42 | testing and use of these systems is welcomed. Just be aware that it | ||
43 | may not meet the normal level of reliability or it may fail to work | ||
44 | in some special cases. Detailed bug reports from people familiar | ||
45 | with the kernel internals are usually welcomed by the developers | ||
46 | (before submitting bug reports, please read the documents | ||
47 | <file:README>, <file:MAINTAINERS>, <file:REPORTING-BUGS>, | ||
48 | <file:Documentation/BUG-HUNTING>, and | ||
49 | <file:Documentation/oops-tracing.txt> in the kernel source). | ||
50 | |||
51 | This option will also make obsoleted drivers available. These are | ||
52 | drivers that have been replaced by something else, and/or are | ||
53 | scheduled to be removed in a future kernel release. | ||
54 | |||
55 | Unless you intend to help test and develop a feature or driver that | ||
56 | falls into this category, or you have a situation that requires | ||
57 | using these features, you should probably say N here, which will | ||
58 | cause the configurator to present you with fewer choices. If | ||
59 | you say Y here, you will be offered the choice of using features or | ||
60 | drivers that are currently considered to be in the alpha-test phase. | ||
61 | 34 | ||
62 | config BROKEN | 35 | config BROKEN |
63 | bool | 36 | bool |
@@ -243,7 +216,7 @@ config SYSVIPC_SYSCTL | |||
243 | 216 | ||
244 | config POSIX_MQUEUE | 217 | config POSIX_MQUEUE |
245 | bool "POSIX Message Queues" | 218 | bool "POSIX Message Queues" |
246 | depends on NET && EXPERIMENTAL | 219 | depends on NET |
247 | ---help--- | 220 | ---help--- |
248 | POSIX variant of message queues is a part of IPC. In POSIX message | 221 | POSIX variant of message queues is a part of IPC. In POSIX message |
249 | queues every message has a priority which decides about succession | 222 | queues every message has a priority which decides about succession |
@@ -410,7 +383,7 @@ config BSD_PROCESS_ACCT_V3 | |||
410 | at <http://www.gnu.org/software/acct/>. | 383 | at <http://www.gnu.org/software/acct/>. |
411 | 384 | ||
412 | config TASKSTATS | 385 | config TASKSTATS |
413 | bool "Export task/process statistics through netlink (EXPERIMENTAL)" | 386 | bool "Export task/process statistics through netlink" |
414 | depends on NET | 387 | depends on NET |
415 | default n | 388 | default n |
416 | help | 389 | help |
@@ -423,7 +396,7 @@ config TASKSTATS | |||
423 | Say N if unsure. | 396 | Say N if unsure. |
424 | 397 | ||
425 | config TASK_DELAY_ACCT | 398 | config TASK_DELAY_ACCT |
426 | bool "Enable per-task delay accounting (EXPERIMENTAL)" | 399 | bool "Enable per-task delay accounting" |
427 | depends on TASKSTATS | 400 | depends on TASKSTATS |
428 | help | 401 | help |
429 | Collect information on time spent by a task waiting for system | 402 | Collect information on time spent by a task waiting for system |
@@ -434,7 +407,7 @@ config TASK_DELAY_ACCT | |||
434 | Say N if unsure. | 407 | Say N if unsure. |
435 | 408 | ||
436 | config TASK_XACCT | 409 | config TASK_XACCT |
437 | bool "Enable extended accounting over taskstats (EXPERIMENTAL)" | 410 | bool "Enable extended accounting over taskstats" |
438 | depends on TASKSTATS | 411 | depends on TASKSTATS |
439 | help | 412 | help |
440 | Collect extended task accounting data and send the data | 413 | Collect extended task accounting data and send the data |
@@ -443,7 +416,7 @@ config TASK_XACCT | |||
443 | Say N if unsure. | 416 | Say N if unsure. |
444 | 417 | ||
445 | config TASK_IO_ACCOUNTING | 418 | config TASK_IO_ACCOUNTING |
446 | bool "Enable per-task storage I/O accounting (EXPERIMENTAL)" | 419 | bool "Enable per-task storage I/O accounting" |
447 | depends on TASK_XACCT | 420 | depends on TASK_XACCT |
448 | help | 421 | help |
449 | Collect information on the number of bytes of storage I/O which this | 422 | Collect information on the number of bytes of storage I/O which this |
@@ -907,8 +880,8 @@ config MEMCG_SWAP_ENABLED | |||
907 | select this option (if, for some reason, they need to disable it | 880 | select this option (if, for some reason, they need to disable it |
908 | then swapaccount=0 does the trick). | 881 | then swapaccount=0 does the trick). |
909 | config MEMCG_KMEM | 882 | config MEMCG_KMEM |
910 | bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)" | 883 | bool "Memory Resource Controller Kernel Memory accounting" |
911 | depends on MEMCG && EXPERIMENTAL | 884 | depends on MEMCG |
912 | depends on SLUB || SLAB | 885 | depends on SLUB || SLAB |
913 | help | 886 | help |
914 | The Kernel Memory extension for Memory Resource Controller can limit | 887 | The Kernel Memory extension for Memory Resource Controller can limit |
@@ -920,7 +893,7 @@ config MEMCG_KMEM | |||
920 | 893 | ||
921 | config CGROUP_HUGETLB | 894 | config CGROUP_HUGETLB |
922 | bool "HugeTLB Resource Controller for Control Groups" | 895 | bool "HugeTLB Resource Controller for Control Groups" |
923 | depends on RESOURCE_COUNTERS && HUGETLB_PAGE && EXPERIMENTAL | 896 | depends on RESOURCE_COUNTERS && HUGETLB_PAGE |
924 | default n | 897 | default n |
925 | help | 898 | help |
926 | Provides a cgroup Resource Controller for HugeTLB pages. | 899 | Provides a cgroup Resource Controller for HugeTLB pages. |
@@ -959,7 +932,6 @@ config FAIR_GROUP_SCHED | |||
959 | 932 | ||
960 | config CFS_BANDWIDTH | 933 | config CFS_BANDWIDTH |
961 | bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED" | 934 | bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED" |
962 | depends on EXPERIMENTAL | ||
963 | depends on FAIR_GROUP_SCHED | 935 | depends on FAIR_GROUP_SCHED |
964 | default n | 936 | default n |
965 | help | 937 | help |
@@ -971,7 +943,6 @@ config CFS_BANDWIDTH | |||
971 | 943 | ||
972 | config RT_GROUP_SCHED | 944 | config RT_GROUP_SCHED |
973 | bool "Group scheduling for SCHED_RR/FIFO" | 945 | bool "Group scheduling for SCHED_RR/FIFO" |
974 | depends on EXPERIMENTAL | ||
975 | depends on CGROUP_SCHED | 946 | depends on CGROUP_SCHED |
976 | default n | 947 | default n |
977 | help | 948 | help |
@@ -1053,8 +1024,7 @@ config IPC_NS | |||
1053 | different IPC objects in different namespaces. | 1024 | different IPC objects in different namespaces. |
1054 | 1025 | ||
1055 | config USER_NS | 1026 | config USER_NS |
1056 | bool "User namespace (EXPERIMENTAL)" | 1027 | bool "User namespace" |
1057 | depends on EXPERIMENTAL | ||
1058 | depends on UIDGID_CONVERTED | 1028 | depends on UIDGID_CONVERTED |
1059 | select UIDGID_STRICT_TYPE_CHECKS | 1029 | select UIDGID_STRICT_TYPE_CHECKS |
1060 | 1030 | ||
@@ -1636,7 +1606,7 @@ config MODULE_UNLOAD | |||
1636 | 1606 | ||
1637 | config MODULE_FORCE_UNLOAD | 1607 | config MODULE_FORCE_UNLOAD |
1638 | bool "Forced module unloading" | 1608 | bool "Forced module unloading" |
1639 | depends on MODULE_UNLOAD && EXPERIMENTAL | 1609 | depends on MODULE_UNLOAD |
1640 | help | 1610 | help |
1641 | This option allows you to force a module to unload, even if the | 1611 | This option allows you to force a module to unload, even if the |
1642 | kernel believes it is unsafe: the kernel will remove the module | 1612 | kernel believes it is unsafe: the kernel will remove the module |