From d789e89b3a2c4f63e31b0580feac26c2e7bcf060 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 19 Jul 2014 19:06:27 +0000 Subject: [PATCH] [powerpc/powerpc64,ppc64] Enable PPC_TRANSACTIONAL_MEM svn path=/dists/sid/linux/; revision=21573 --- debian/changelog | 1 + debian/config/kernelarch-powerpc/config-arch-64-be | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0631d5d8c..dd5842ba0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ linux (3.14.12-2) UNRELEASED; urgency=medium * net/l2tp: don't fall back on UDP [get|set]sockopt (CVE-2014-4943) * Bump ABI to 2 (Closes: #754902) * [powerpc/powerpc64] Re-enable JUMP_LABEL + * [powerpc/powerpc64,ppc64] Enable PPC_TRANSACTIONAL_MEM -- Ian Campbell Sat, 12 Jul 2014 21:12:17 +0100 diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be index 13be21332..486c347b3 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64-be +++ b/debian/config/kernelarch-powerpc/config-arch-64-be @@ -1,9 +1,3 @@ -## -## file: arch/powerpc/Kconfig -## -#. Temporarily disabled to maintain ABI -# CONFIG_PPC_TRANSACTIONAL_MEM is not set - ## ## file: arch/powerpc/platforms/Kconfig.cputype ##