diff --git a/debian/changelog b/debian/changelog index 09bc632c5..11e0d9cfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ linux (3.16-1~exp1) UNRELEASED; urgency=medium * Enable stack protector on all supported architectures. (closes: #756898) * [powerpc64, s390x] Enable PCI hotplug. * Enable RTL8723BE. + * Enable OPROFILE. [ Ben Hutchings ] * udeb: Add new sound drivers to sound-modules (thanks to Samuel Thibault) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 4baee75a9..d83354997 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -# CONFIG_OPROFILE is not set - ## ## file: arch/alpha/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 1c1699003..7f038dc24 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1,6 +1,7 @@ ## ## file: arch/Kconfig ## +CONFIG_OPROFILE=m CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y ## choice: Stack Protector buffer overflow detection diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 7ba56b9ac..7987acabb 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -# CONFIG_OPROFILE is not set - ## ## file: arch/parisc/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 996e16741..b8896e1e1 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -CONFIG_OPROFILE=m - ## ## file: arch/ia64/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta index 4c70dd366..aacee7d62 100644 --- a/debian/config/kernelarch-mips/config.4kc-malta +++ b/debian/config/kernelarch-mips/config.4kc-malta @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -CONFIG_OPROFILE=m - ## ## file: arch/mips/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta index 116a71223..52c525f68 100644 --- a/debian/config/kernelarch-mips/config.5kc-malta +++ b/debian/config/kernelarch-mips/config.5kc-malta @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -CONFIG_OPROFILE=m - ## ## file: arch/mips/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.r4k-ip22 b/debian/config/kernelarch-mips/config.r4k-ip22 index bb5b14d1b..f9071d417 100644 --- a/debian/config/kernelarch-mips/config.r4k-ip22 +++ b/debian/config/kernelarch-mips/config.r4k-ip22 @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -# CONFIG_OPROFILE is not set - ## ## file: arch/mips/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.r5k-ip32 b/debian/config/kernelarch-mips/config.r5k-ip32 index e5a575016..ff18690fb 100644 --- a/debian/config/kernelarch-mips/config.r5k-ip32 +++ b/debian/config/kernelarch-mips/config.r5k-ip32 @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -# CONFIG_OPROFILE is not set - ## ## file: arch/mips/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.sb1-bcm91250a b/debian/config/kernelarch-mips/config.sb1-bcm91250a index f6bf07445..e3e697df6 100644 --- a/debian/config/kernelarch-mips/config.sb1-bcm91250a +++ b/debian/config/kernelarch-mips/config.sb1-bcm91250a @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -# CONFIG_OPROFILE is not set - ## ## file: arch/mips/Kconfig ## diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config index f9feecbd1..7c80591d8 100644 --- a/debian/config/kernelarch-powerpc/config +++ b/debian/config/kernelarch-powerpc/config @@ -1,8 +1,3 @@ -## -## file: arch/Kconfig -## -CONFIG_OPROFILE=m - ## ## file: arch/powerpc/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index a2093f4eb..cf1021a42 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1,7 +1,6 @@ ## ## file: arch/Kconfig ## -CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set ##