drivers: staging: zcache: fix Kconfig crypto dependency
diff mbox series

Message ID 1335231230-29344-1-git-send-email-sjenning@linux.vnet.ibm.com
State New, archived
Headers show
Series
  • drivers: staging: zcache: fix Kconfig crypto dependency
Related show

Commit Message

Seth Jennings April 24, 2012, 1:33 a.m. UTC
ZCACHE is a boolean in the Kconfig.  When selected, it
should require that CRYPTO be builtin (=y).

Currently, ZCACHE=y and CRYPTO=m is a valid configuration
when it should not be.

This patch changes the zcache Kconfig to enforce this
dependency.

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
---
 drivers/staging/zcache/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Konrad Rzeszutek Wilk April 24, 2012, 2:09 a.m. UTC | #1
On Mon, Apr 23, 2012 at 08:33:50PM -0500, Seth Jennings wrote:
> ZCACHE is a boolean in the Kconfig.  When selected, it
> should require that CRYPTO be builtin (=y).

Hey Greg,

Please push this to your tree at your convience. linux-next
folks found this combination breaks the build ..

> 
> Currently, ZCACHE=y and CRYPTO=m is a valid configuration
> when it should not be.
> 
> This patch changes the zcache Kconfig to enforce this
> dependency.
> 
> Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>

Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
>  drivers/staging/zcache/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
> index 3ed2c8f..7048e01 100644
> --- a/drivers/staging/zcache/Kconfig
> +++ b/drivers/staging/zcache/Kconfig
> @@ -2,7 +2,7 @@ config ZCACHE
>  	bool "Dynamic compression of swap pages and clean pagecache pages"
>  	# X86 dependency is because zsmalloc uses non-portable pte/tlb
>  	# functions
> -	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86
> +	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86
>  	select ZSMALLOC
>  	select CRYPTO_LZO
>  	default n
> -- 
> 1.7.5.4
--
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/
Greg Kroah-Hartman April 24, 2012, 2:27 a.m. UTC | #2
On Mon, Apr 23, 2012 at 08:33:50PM -0500, Seth Jennings wrote:
> ZCACHE is a boolean in the Kconfig.  When selected, it
> should require that CRYPTO be builtin (=y).
> 
> Currently, ZCACHE=y and CRYPTO=m is a valid configuration
> when it should not be.
> 
> This patch changes the zcache Kconfig to enforce this
> dependency.
> 
> Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
> ---
>  drivers/staging/zcache/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
> index 3ed2c8f..7048e01 100644
> --- a/drivers/staging/zcache/Kconfig
> +++ b/drivers/staging/zcache/Kconfig
> @@ -2,7 +2,7 @@ config ZCACHE
>  	bool "Dynamic compression of swap pages and clean pagecache pages"
>  	# X86 dependency is because zsmalloc uses non-portable pte/tlb
>  	# functions
> -	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86
> +	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86

Ok, this fixes one of the build problems reported, what about the other
one?

greg k-h
--
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/
Seth Jennings April 24, 2012, 1:30 p.m. UTC | #3
On 04/23/2012 09:27 PM, Greg Kroah-Hartman wrote:
> Ok, this fixes one of the build problems reported, what about the other
> one?

Both problems that I heard about were caused by same issue;
the issue fixed in this patch.

ZSMALLOC=m was only allowed because CRYPTO=m was allowed.
This patch requires CRYPTO=y, which also requires ZSMALLOC=y
when ZCACHE=y.

https://lkml.org/lkml/2012/4/19/588

https://lkml.org/lkml/2012/4/23/481

Thanks,
Seth

--
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/
Greg Kroah-Hartman April 24, 2012, 2:35 p.m. UTC | #4
On Tue, Apr 24, 2012 at 08:30:28AM -0500, Seth Jennings wrote:
> On 04/23/2012 09:27 PM, Greg Kroah-Hartman wrote:
> > Ok, this fixes one of the build problems reported, what about the other
> > one?
> 
> Both problems that I heard about were caused by same issue;
> the issue fixed in this patch.
> 
> ZSMALLOC=m was only allowed because CRYPTO=m was allowed.
> This patch requires CRYPTO=y, which also requires ZSMALLOC=y
> when ZCACHE=y.
> 
> https://lkml.org/lkml/2012/4/19/588
> 
> https://lkml.org/lkml/2012/4/23/481

Ah, ok, I didn't realize that, thanks for letting me know, I'll queue
this up later today.

greg k-h
--
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/
Randy Dunlap April 28, 2012, 12:38 a.m. UTC | #5
On 04/23/2012 06:33 PM, Seth Jennings wrote:

> ZCACHE is a boolean in the Kconfig.  When selected, it
> should require that CRYPTO be builtin (=y).
> 
> Currently, ZCACHE=y and CRYPTO=m is a valid configuration
> when it should not be.
> 
> This patch changes the zcache Kconfig to enforce this
> dependency.
> 
> Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>


Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks.

> ---
>  drivers/staging/zcache/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
> index 3ed2c8f..7048e01 100644
> --- a/drivers/staging/zcache/Kconfig
> +++ b/drivers/staging/zcache/Kconfig
> @@ -2,7 +2,7 @@ config ZCACHE
>  	bool "Dynamic compression of swap pages and clean pagecache pages"
>  	# X86 dependency is because zsmalloc uses non-portable pte/tlb
>  	# functions
> -	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86
> +	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86
>  	select ZSMALLOC
>  	select CRYPTO_LZO
>  	default n
Dan Magenheimer May 3, 2012, 9:11 p.m. UTC | #6
> From: Randy Dunlap [mailto:rdunlap@xenotime.net]
> Sent: Friday, April 27, 2012 6:38 PM
> To: Seth Jennings
> Cc: Greg Kroah-Hartman; devel@driverdev.osuosl.org; Dan Magenheimer; Autif Khan; Konrad Rzeszutek
> Wilk; linux-kernel@vger.kernel.org; linux-mm@kvack.org; Robert Jennings; Nitin Gupta
> Subject: Re: [PATCH] drivers: staging: zcache: fix Kconfig crypto dependency
> 
> On 04/23/2012 06:33 PM, Seth Jennings wrote:
> 
> > ZCACHE is a boolean in the Kconfig.  When selected, it
> > should require that CRYPTO be builtin (=y).
> >
> > Currently, ZCACHE=y and CRYPTO=m is a valid configuration
> > when it should not be.
> >
> > This patch changes the zcache Kconfig to enforce this
> > dependency.
> >
> > Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
> 
> 
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Not sure if you need my approval, but I just in case you are waiting
for it:

Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>

> > ---
> >  drivers/staging/zcache/Kconfig |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
> > index 3ed2c8f..7048e01 100644
> > --- a/drivers/staging/zcache/Kconfig
> > +++ b/drivers/staging/zcache/Kconfig
> > @@ -2,7 +2,7 @@ config ZCACHE
> >  	bool "Dynamic compression of swap pages and clean pagecache pages"
> >  	# X86 dependency is because zsmalloc uses non-portable pte/tlb
> >  	# functions
> > -	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86
> > +	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86
> >  	select ZSMALLOC
> >  	select CRYPTO_LZO
> >  	default n
> 
> 
> 
> --
> ~Randy
--
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/

Patch
diff mbox series

diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 3ed2c8f..7048e01 100644
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -2,7 +2,7 @@  config ZCACHE
 	bool "Dynamic compression of swap pages and clean pagecache pages"
 	# X86 dependency is because zsmalloc uses non-portable pte/tlb
 	# functions
-	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86
+	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86
 	select ZSMALLOC
 	select CRYPTO_LZO
 	default n