Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751503Ab2HAEgo (ORCPT ); Wed, 1 Aug 2012 00:36:44 -0400 Received: from ozlabs.org ([203.10.76.45]:53199 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751015Ab2HAEgn (ORCPT ); Wed, 1 Aug 2012 00:36:43 -0400 From: Michael Neuling To: Seth Jennings cc: Herbert Xu , Stephen Rothwell , linux-next@vger.kernel.org, LKML , Kent Yoder , Benjamin Herrenschmidt , anton@samba.org Subject: Re: [PATCH v2] powerpc/crypto: fix defconfig break In-reply-to: <1343794529-28329-1-git-send-email-sjenning@linux.vnet.ibm.com> References: <1343794529-28329-1-git-send-email-sjenning@linux.vnet.ibm.com> Comments: In-reply-to Seth Jennings message dated "Tue, 31 Jul 2012 23:15:29 -0500." X-Mailer: MH-E 8.2; nmh 1.3; GNU Emacs 23.3.1 Date: Wed, 01 Aug 2012 14:36:40 +1000 Message-ID: <15996.1343795800@neuling.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2311 Lines: 65 Seth Jennings wrote: > 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 Works, thanks. Tested-by: Michael Neuling > --- > 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/