Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353627
b: refs/heads/master
c: d6f94fa
h: refs/heads/master
i:
  353625: 3e5e1ee
  353623: df22001
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent d1bd77b commit c51bda3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b7e17a10edf3638bb3e42621389448892a9cce6e
refs/heads/master: d6f94fa0f37e5b33dd7d00880e959bfbc3329267
19 changes: 8 additions & 11 deletions trunk/arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,6 @@ config SMP

config SMP_ON_UP
bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"
depends on EXPERIMENTAL
depends on SMP && !XIP_KERNEL
default y
help
Expand Down Expand Up @@ -1719,7 +1718,7 @@ config AEABI

config OABI_COMPAT
bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)"
depends on AEABI && EXPERIMENTAL && !THUMB2_KERNEL
depends on AEABI && !THUMB2_KERNEL
default y
help
This option preserves the old syscall interface along with the
Expand Down Expand Up @@ -1843,7 +1842,6 @@ config SECCOMP

config CC_STACKPROTECTOR
bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
depends on EXPERIMENTAL
help
This option turns on the -fstack-protector GCC feature. This
feature puts, at the beginning of functions, a canary value on
Expand All @@ -1860,7 +1858,7 @@ config XEN_DOM0

config XEN
bool "Xen guest support on ARM (EXPERIMENTAL)"
depends on EXPERIMENTAL && ARM && OF
depends on ARM && OF
depends on CPU_V7 && !CPU_V6
help
Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
Expand Down Expand Up @@ -1929,7 +1927,7 @@ config ZBOOT_ROM

choice
prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)"
depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL
depends on ZBOOT_ROM && ARCH_SH7372
default ZBOOT_ROM_NONE
help
Include experimental SD/MMC loading code in the ROM-able zImage.
Expand Down Expand Up @@ -1958,7 +1956,7 @@ endchoice

config ARM_APPENDED_DTB
bool "Use appended device tree blob to zImage (EXPERIMENTAL)"
depends on OF && !ZBOOT_ROM && EXPERIMENTAL
depends on OF && !ZBOOT_ROM
help
With this option, the boot code will look for a device tree binary
(DTB) appended to zImage
Expand Down Expand Up @@ -2076,7 +2074,7 @@ config XIP_PHYS_ADDR

config KEXEC
bool "Kexec system call (EXPERIMENTAL)"
depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU)
depends on (!SMP || HOTPLUG_CPU)
help
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
Expand All @@ -2098,7 +2096,6 @@ config ATAGS_PROC

config CRASH_DUMP
bool "Build kdump crash kernel (EXPERIMENTAL)"
depends on EXPERIMENTAL
help
Generate crash dump after being started by kexec. This should
be normally only set in special crash dump kernels which are
Expand Down Expand Up @@ -2165,7 +2162,7 @@ config CPU_FREQ_S3C

config CPU_FREQ_S3C24XX
bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"
depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL
depends on ARCH_S3C24XX && CPU_FREQ
select CPU_FREQ_S3C
help
This enables the CPUfreq driver for the Samsung S3C24XX family
Expand All @@ -2177,7 +2174,7 @@ config CPU_FREQ_S3C24XX

config CPU_FREQ_S3C24XX_PLL
bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
depends on CPU_FREQ_S3C24XX && EXPERIMENTAL
depends on CPU_FREQ_S3C24XX
help
Compile in support for changing the PLL frequency from the
S3C24XX series CPUfreq driver. The PLL takes time to settle
Expand Down Expand Up @@ -2240,7 +2237,7 @@ config FPE_NWFPE_XP

config FPE_FASTFPE
bool "FastFPE math emulation (EXPERIMENTAL)"
depends on (!AEABI || OABI_COMPAT) && !CPU_32v3 && EXPERIMENTAL
depends on (!AEABI || OABI_COMPAT) && !CPU_32v3
---help---
Say Y here to include the FAST floating point emulator in the kernel.
This is an experimental much faster emulator which now also has full
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ config FRAME_POINTER

config ARM_UNWIND
bool "Enable stack unwinding support (EXPERIMENTAL)"
depends on AEABI && EXPERIMENTAL
depends on AEABI
default y
help
This option enables stack unwinding support in the kernel
Expand Down

0 comments on commit c51bda3

Please sign in to comment.