diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-05 18:06:22 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-05 18:06:22 -0500 |
commit | 4a50bfe365a977f634311504484342fbfffe855c (patch) | |
tree | bbe92d0aef2062feea7ea26d46d409e16aaf2669 /arch/arm/Kconfig | |
parent | 0385ebc0c9b16fc2d8262c082843165313f7b1e4 (diff) |
ARM: Ensure experimental options are so marked
It is kernel-wide policy that options depending on EXPERIMENTAL should
also have '(EXPERIMENTAL)' in their option text, and options with
'(EXPERIMENTAL)' depend on EXPERIMENTAL.
Ensure that all ARM options comply with this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7e94f8609c87..fd0e21be5e44 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1315,7 +1315,7 @@ config HZ | |||
1315 | default 100 | 1315 | default 100 |
1316 | 1316 | ||
1317 | config THUMB2_KERNEL | 1317 | config THUMB2_KERNEL |
1318 | bool "Compile the kernel in Thumb-2 mode" | 1318 | bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)" |
1319 | depends on CPU_V7 && EXPERIMENTAL | 1319 | depends on CPU_V7 && EXPERIMENTAL |
1320 | select AEABI | 1320 | select AEABI |
1321 | select ARM_ASM_UNIFIED | 1321 | select ARM_ASM_UNIFIED |
@@ -1529,6 +1529,7 @@ config SECCOMP | |||
1529 | 1529 | ||
1530 | config CC_STACKPROTECTOR | 1530 | config CC_STACKPROTECTOR |
1531 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 1531 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
1532 | depends on EXPERIMENTAL | ||
1532 | help | 1533 | help |
1533 | This option turns on the -fstack-protector GCC feature. This | 1534 | This option turns on the -fstack-protector GCC feature. This |
1534 | feature puts, at the beginning of functions, a canary value on | 1535 | feature puts, at the beginning of functions, a canary value on |
@@ -1712,7 +1713,7 @@ config CPU_FREQ_S3C | |||
1712 | Internal configuration node for common cpufreq on Samsung SoC | 1713 | Internal configuration node for common cpufreq on Samsung SoC |
1713 | 1714 | ||
1714 | config CPU_FREQ_S3C24XX | 1715 | config CPU_FREQ_S3C24XX |
1715 | bool "CPUfreq driver for Samsung S3C24XX series CPUs" | 1716 | bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" |
1716 | depends on ARCH_S3C2410 && CPU_FREQ && EXPERIMENTAL | 1717 | depends on ARCH_S3C2410 && CPU_FREQ && EXPERIMENTAL |
1717 | select CPU_FREQ_S3C | 1718 | select CPU_FREQ_S3C |
1718 | help | 1719 | help |
@@ -1724,7 +1725,7 @@ config CPU_FREQ_S3C24XX | |||
1724 | If in doubt, say N. | 1725 | If in doubt, say N. |
1725 | 1726 | ||
1726 | config CPU_FREQ_S3C24XX_PLL | 1727 | config CPU_FREQ_S3C24XX_PLL |
1727 | bool "Support CPUfreq changing of PLL frequency" | 1728 | bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" |
1728 | depends on CPU_FREQ_S3C24XX && EXPERIMENTAL | 1729 | depends on CPU_FREQ_S3C24XX && EXPERIMENTAL |
1729 | help | 1730 | help |
1730 | Compile in support for changing the PLL frequency from the | 1731 | Compile in support for changing the PLL frequency from the |