From 9e06d071e49a01c8401a5f5fdc299c348c7a68d4 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Fri, 31 Jul 2009 21:39:39 +0000 Subject: [PATCH] x86 enable CC_STACKPROTECTOR for lenny gcc was already useful for aboves, so finaly turn it on. svn path=/dists/trunk/linux-2.6/; revision=14067 --- debian/changelog | 3 ++- debian/config/kernelarch-x86/config | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08ef5cd9c..e103587eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,7 +24,8 @@ linux-2.6 (2.6.31~rc4-1~experimental.1) UNRELEASED; urgency=low * Disable v4l1 ov511 and quickcam_messenger drivers. * [x86_64] Enable HW_RANDOM_VIA. * [x86] Keep divers staging stuff enabled. - * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS, ACERHDF, EDAC_AMD64. + * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS, ACERHDF, EDAC_AMD64, + CC_STACKPROTECTOR. * rtl8192su: remove firmware and disable. * Newer Standards-Version 3.8.2 without changes. * Allow install in chroot without do_initrd check for piuparts. diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 92a77dc01..81320ae59 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -42,7 +42,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_EFI=y CONFIG_SECCOMP=y -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set # CONFIG_KEXEC_JUMP is not set