From: Russell King Date: Thu, 29 Jul 2010 21:27:56 +0000 (+0100) Subject: Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel... X-Git-Tag: v2.6.36-rc1~591^2^2 X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=a20df564d15bd28e3df24e1c65b885bd74d23f17 Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable Conflicts: arch/arm/Kconfig --- a20df564d15bd28e3df24e1c65b885bd74d23f17 diff --cc arch/arm/Kconfig index 738f404d5e3,0b0cf0d2872..4e829c604f9 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -1392,18 -1374,12 +1392,24 @@@ config UACCESS_WITH_MEMCP However, if the CPU data cache is using a write-allocate mode, this option is unlikely to provide any performance gain. +config CC_STACKPROTECTOR + bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" + help + This option turns on the -fstack-protector GCC feature. This + feature puts, at the beginning of functions, a canary value on + the stack just before the return address, and validates + the value just before actually returning. Stack based buffer + overflows (that need to overwrite this return address) now also + overwrite the canary, which gets detected and the attack is then + neutralized via a kernel panic. + This feature requires gcc version 4.2 or above. + + config DEPRECATED_PARAM_STRUCT + bool "Provide old way to pass kernel parameters" + help + This was deprecated in 2001 and announced to live on for 5 years. + Some old boot loaders still use this way. + endmenu menu "Boot options"