Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751268Ab2HAEPn (ORCPT ); Wed, 1 Aug 2012 00:15:43 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:35268 "EHLO e35.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888Ab2HAEPk (ORCPT ); Wed, 1 Aug 2012 00:15:40 -0400 From: Seth Jennings To: Herbert Xu Cc: Seth Jennings , Michael Neuling , Stephen Rothwell , linux-next@vger.kernel.org, LKML , Kent Yoder , Benjamin Herrenschmidt , anton@samba.org Subject: [PATCH v2] powerpc/crypto: fix defconfig break Date: Tue, 31 Jul 2012 23:15:29 -0500 Message-Id: <1343794529-28329-1-git-send-email-sjenning@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12080104-6148-0000-0000-00000834CCCD Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2088 Lines: 58 As part of the Kconfig rework for drivers/crypto/nx, the meaning of CONFIG_CRYPTO_DEV_NX was changed. At the same time this commit was heading upstream fd297b3a7302ab866306f53c1fd1e97b083fe83e powerpc: Enable pseries hardware RNG and crypto module still used the old meaning, set CONFIG_CRYPTO_DEV_NX=m when it is now a bool in the Kconfig. This patch repairs the break. Reported-by: Michael Neuling Signed-off-by: Seth Jennings --- This patch is based on Linus master which already contains the commit above. Please apply this patch before my patchset (powerpc/crypto: IBM Power7+ in-Nest compression support) to avoid the defconfig break. arch/powerpc/configs/ppc64_defconfig | 3 ++- arch/powerpc/configs/pseries_defconfig | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index db27c82..2d9150a1 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig @@ -487,7 +487,8 @@ CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_LZO=m # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_NX=m +CONFIG_CRYPTO_DEV_NX=y +CONFIG_CRYPTO_DEV_NX_ENCRYPT=m CONFIG_VIRTUALIZATION=y CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64_HV=y diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 1f65b3c..9f4a936 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -369,7 +369,8 @@ CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_LZO=m # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_NX=m +CONFIG_CRYPTO_DEV_NX=y +CONFIG_CRYPTO_DEV_NX_ENCRYPT=m CONFIG_VIRTUALIZATION=y CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64_HV=y -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/