diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 13:59:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 13:59:36 -0400 |
| commit | 1ca0049f2c8b28611f30798aa75858763c9fcbea (patch) | |
| tree | b111e3eb47ff37e962d227de1daf242fb3ef15c3 /arch/x86/Kconfig | |
| parent | ddc5057c1c1fb3e99afeeef45d2b8ff9597e6707 (diff) | |
| parent | eaf4ce6c5fed6b4c55f7efcd5fc3477435cab5e9 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Various fixes"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64, kcmp: The kcmp system call can be common
arch/x86/kernel/kdebugfs.c: Ensure a consistent return value in error case
x86/mce: Add quirk for instruction recovery on Sandy Bridge processors
x86/mce: Move MCACOD defines from mce-severity.c to <asm/mce.h>
x86/ioapic: Fix NULL pointer dereference on CPU hotplug after disabling irqs
x86, nops: Missing break resulting in incorrect selection on Intel
x86: CONFIG_CC_STACKPROTECTOR=y is no longer experimental
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ba2657c4921..8ec3a1aa4ab 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1527,7 +1527,7 @@ config SECCOMP | |||
| 1527 | If unsure, say Y. Only embedded should say N here. | 1527 | If unsure, say Y. Only embedded should say N here. |
| 1528 | 1528 | ||
| 1529 | config CC_STACKPROTECTOR | 1529 | config CC_STACKPROTECTOR |
| 1530 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 1530 | bool "Enable -fstack-protector buffer overflow detection" |
| 1531 | ---help--- | 1531 | ---help--- |
| 1532 | This option turns on the -fstack-protector GCC feature. This | 1532 | This option turns on the -fstack-protector GCC feature. This |
| 1533 | feature puts, at the beginning of functions, a canary value on | 1533 | feature puts, at the beginning of functions, a canary value on |