diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/x86/Kconfig | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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 3be2305709b7..4a88cf7695b4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1054,7 +1054,7 @@ config SECCOMP | |||
| 1054 | 1054 | ||
| 1055 | config CC_STACKPROTECTOR | 1055 | config CC_STACKPROTECTOR |
| 1056 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 1056 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
| 1057 | depends on X86_64 && EXPERIMENTAL | 1057 | depends on X86_64 && EXPERIMENTAL && BROKEN |
| 1058 | help | 1058 | help |
| 1059 | This option turns on the -fstack-protector GCC feature. This | 1059 | This option turns on the -fstack-protector GCC feature. This |
| 1060 | feature puts, at the beginning of critical functions, a canary | 1060 | feature puts, at the beginning of critical functions, a canary |