diff options
author | Kees Cook <keescook@chromium.org> | 2012-10-02 14:16:15 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2013-01-11 14:38:03 -0500 |
commit | 0335cb469ad4ab3072a4246ceb0573483fcee5bf (patch) | |
tree | 9dddc1aecd4a51820e293e57c6798a734ef640cd | |
parent | 5a958db311c416345a61b7bddc62a5c6c7112c7f (diff) |
Documentation: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
CC: Rob Landley <rob@landley.net>
CC: Jiri Kosina <jkosina@suse.cz>
CC: Masanari Iida <standby24x7@gmail.com>
CC: Jason Wessel <jason.wessel@windriver.com>
CC: Richard L Maliszewski <richard.l.maliszewski@intel.com>
CC: Gang Wei <gang.wei@intel.com>
CC: Shane Wang <shane.wang@intel.com>
CC: Harry Wei <harryxiyou@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Jason Wessel <jason.wessel@windriver.com>
-rw-r--r-- | Documentation/CodingStyle | 10 | ||||
-rw-r--r-- | Documentation/DocBook/kernel-hacking.tmpl | 7 | ||||
-rw-r--r-- | Documentation/DocBook/kgdb.tmpl | 6 | ||||
-rw-r--r-- | Documentation/intel_txt.txt | 2 | ||||
-rw-r--r-- | Documentation/zh_CN/CodingStyle | 7 |
5 files changed, 4 insertions, 28 deletions
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index 495e5ba1634c..e00b8f0dde52 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle | |||
@@ -546,15 +546,7 @@ config AUDIT | |||
546 | logging of avc messages output). Does not do system-call | 546 | logging of avc messages output). Does not do system-call |
547 | auditing without CONFIG_AUDITSYSCALL. | 547 | auditing without CONFIG_AUDITSYSCALL. |
548 | 548 | ||
549 | Features that might still be considered unstable should be defined as | 549 | Seriously dangerous features (such as write support for certain |
550 | dependent on "EXPERIMENTAL": | ||
551 | |||
552 | config SLUB | ||
553 | depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT | ||
554 | bool "SLUB (Unqueued Allocator)" | ||
555 | ... | ||
556 | |||
557 | while seriously dangerous features (such as write support for certain | ||
558 | filesystems) should advertise this prominently in their prompt string: | 550 | filesystems) should advertise this prominently in their prompt string: |
559 | 551 | ||
560 | config ADFS_FS_RW | 552 | config ADFS_FS_RW |
diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl index eee71426ecb8..22e0bd1adf25 100644 --- a/Documentation/DocBook/kernel-hacking.tmpl +++ b/Documentation/DocBook/kernel-hacking.tmpl | |||
@@ -1185,13 +1185,6 @@ static struct block_device_operations opt_fops = { | |||
1185 | </para> | 1185 | </para> |
1186 | 1186 | ||
1187 | <para> | 1187 | <para> |
1188 | You may well want to make your CONFIG option only visible if | ||
1189 | <symbol>CONFIG_EXPERIMENTAL</symbol> is enabled: this serves as a | ||
1190 | warning to users. There many other fancy things you can do: see | ||
1191 | the various <filename>Kconfig</filename> files for ideas. | ||
1192 | </para> | ||
1193 | |||
1194 | <para> | ||
1195 | In your description of the option, make sure you address both the | 1188 | In your description of the option, make sure you address both the |
1196 | expert user and the user who knows nothing about your feature. Mention | 1189 | expert user and the user who knows nothing about your feature. Mention |
1197 | incompatibilities and issues here. <emphasis> Definitely | 1190 | incompatibilities and issues here. <emphasis> Definitely |
diff --git a/Documentation/DocBook/kgdb.tmpl b/Documentation/DocBook/kgdb.tmpl index 4ee4ba3509fc..f77358f96930 100644 --- a/Documentation/DocBook/kgdb.tmpl +++ b/Documentation/DocBook/kgdb.tmpl | |||
@@ -94,10 +94,8 @@ | |||
94 | <sect1 id="CompileKGDB"> | 94 | <sect1 id="CompileKGDB"> |
95 | <title>Kernel config options for kgdb</title> | 95 | <title>Kernel config options for kgdb</title> |
96 | <para> | 96 | <para> |
97 | To enable <symbol>CONFIG_KGDB</symbol> you should first turn on | 97 | To enable <symbol>CONFIG_KGDB</symbol> you should look under |
98 | "Prompt for development and/or incomplete code/drivers" | 98 | "Kernel debugging" and select "KGDB: kernel debugger". |
99 | (CONFIG_EXPERIMENTAL) in "General setup", then under the | ||
100 | "Kernel debugging" select "KGDB: kernel debugger". | ||
101 | </para> | 99 | </para> |
102 | <para> | 100 | <para> |
103 | While it is not a hard requirement that you have symbols in your | 101 | While it is not a hard requirement that you have symbols in your |
diff --git a/Documentation/intel_txt.txt b/Documentation/intel_txt.txt index 849de1a78e77..91d89c540709 100644 --- a/Documentation/intel_txt.txt +++ b/Documentation/intel_txt.txt | |||
@@ -192,7 +192,7 @@ grub.conf needs to be modified as follows: | |||
192 | 192 | ||
193 | The kernel option for enabling Intel TXT support is found under the | 193 | The kernel option for enabling Intel TXT support is found under the |
194 | Security top-level menu and is called "Enable Intel(R) Trusted | 194 | Security top-level menu and is called "Enable Intel(R) Trusted |
195 | Execution Technology (TXT)". It is marked as EXPERIMENTAL and | 195 | Execution Technology (TXT)". It is considered EXPERIMENTAL and |
196 | depends on the generic x86 support (to allow maximum flexibility in | 196 | depends on the generic x86 support (to allow maximum flexibility in |
197 | kernel build options), since the tboot code will detect whether the | 197 | kernel build options), since the tboot code will detect whether the |
198 | platform actually supports Intel TXT and thus whether any of the | 198 | platform actually supports Intel TXT and thus whether any of the |
diff --git a/Documentation/zh_CN/CodingStyle b/Documentation/zh_CN/CodingStyle index ecd9307a641f..654afd72eb24 100644 --- a/Documentation/zh_CN/CodingStyle +++ b/Documentation/zh_CN/CodingStyle | |||
@@ -462,13 +462,6 @@ config AUDIT | |||
462 | logging of avc messages output). Does not do system-call | 462 | logging of avc messages output). Does not do system-call |
463 | auditing without CONFIG_AUDITSYSCALL. | 463 | auditing without CONFIG_AUDITSYSCALL. |
464 | 464 | ||
465 | 仍然被认为不够稳定的功能应该被定义为依赖于“EXPERIMENTAL”: | ||
466 | |||
467 | config SLUB | ||
468 | depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT | ||
469 | bool "SLUB (Unqueued Allocator)" | ||
470 | ... | ||
471 | |||
472 | 而那些危险的功能(比如某些文件系统的写支持)应该在它们的提示字符串里显著的声明这 | 465 | 而那些危险的功能(比如某些文件系统的写支持)应该在它们的提示字符串里显著的声明这 |
473 | 一点: | 466 | 一点: |
474 | 467 | ||