Commit f64d94f9 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Greg Kroah-Hartman

staging: zcache: remove unnecessary config option dependence

zcache is enabled only if one of CONFIG_CLEANCACHE and CONFIG_FRONTSWAP is
enabled, see the Kconfig:
	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86
So, we can remove the check in the source code
Acked-by: default avatarSeth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1655447
...@@ -36,9 +36,6 @@ ...@@ -36,9 +36,6 @@
#include "../zsmalloc/zsmalloc.h" #include "../zsmalloc/zsmalloc.h"
#if (!defined(CONFIG_CLEANCACHE) && !defined(CONFIG_FRONTSWAP))
#error "zcache is useless without CONFIG_CLEANCACHE or CONFIG_FRONTSWAP"
#endif
#ifdef CONFIG_CLEANCACHE #ifdef CONFIG_CLEANCACHE
#include <linux/cleancache.h> #include <linux/cleancache.h>
#endif #endif
...@@ -2028,7 +2025,7 @@ static int __init zcache_init(void) ...@@ -2028,7 +2025,7 @@ static int __init zcache_init(void)
goto out; goto out;
} }
#endif /* CONFIG_SYSFS */ #endif /* CONFIG_SYSFS */
#if defined(CONFIG_CLEANCACHE) || defined(CONFIG_FRONTSWAP)
if (zcache_enabled) { if (zcache_enabled) {
unsigned int cpu; unsigned int cpu;
...@@ -2059,7 +2056,7 @@ static int __init zcache_init(void) ...@@ -2059,7 +2056,7 @@ static int __init zcache_init(void)
pr_err("zcache: can't create client\n"); pr_err("zcache: can't create client\n");
goto out; goto out;
} }
#endif
#ifdef CONFIG_CLEANCACHE #ifdef CONFIG_CLEANCACHE
if (zcache_enabled && use_cleancache) { if (zcache_enabled && use_cleancache) {
struct cleancache_ops old_ops; struct cleancache_ops old_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment