From 555ee46f58c12a0b48b1d0b6b62637f874f00f2d Mon Sep 17 00:00:00 2001 From: Bob Liu Date: Tue, 2 Apr 2013 10:47:42 +0800 Subject: [PATCH] drivers: staging: zcache: fix compile error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Because 'ramster_debugfs_init' is not defined if !CONFIG_DEBUG_FS, there is compile error: $ make drivers/staging/zcache/ staging/zcache/ramster/ramster.c: In function ‘ramster_init’: staging/zcache/ramster/ramster.c:981:2: error: implicit declaration of function ‘ramster_debugfs_init’ [-Werror=implicit-function-declaration] This patch fix it and reduce some #ifdef CONFIG_DEBUG_FS in .c files the same way. Reported-by: Fengguang Wu Signed-off-by: Bob Liu Reviewed-by: Konrad Rzeszutek Wilk Signed-off-by: Greg Kroah-Hartman --- drivers/staging/zcache/ramster/ramster.c | 5 +++++ drivers/staging/zcache/zbud.c | 7 +++++-- drivers/staging/zcache/zcache-main.c | 2 -- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/staging/zcache/ramster/ramster.c b/drivers/staging/zcache/ramster/ramster.c index bf96a1cbf7c1..01fc672399fe 100644 --- a/drivers/staging/zcache/ramster/ramster.c +++ b/drivers/staging/zcache/ramster/ramster.c @@ -134,6 +134,11 @@ static int __init ramster_debugfs_init(void) } #undef zdebugfs #undef zdfs64 +#else +static inline int ramster_debugfs_init(void) +{ + return 0; +} #endif static LIST_HEAD(ramster_rem_op_list); diff --git a/drivers/staging/zcache/zbud.c b/drivers/staging/zcache/zbud.c index fdff5c6a0239..6cda4ed9ed31 100644 --- a/drivers/staging/zcache/zbud.c +++ b/drivers/staging/zcache/zbud.c @@ -342,6 +342,11 @@ static int zbud_debugfs_init(void) } #undef zdfs #undef zdfs64 +#else +static inline int zbud_debugfs_init(void) +{ + return 0; +} #endif /* protects the buddied list and all unbuddied lists */ @@ -1051,9 +1056,7 @@ void zbud_init(void) { int i; -#ifdef CONFIG_DEBUG_FS zbud_debugfs_init(); -#endif BUG_ON((sizeof(struct tmem_handle) * 2 > CHUNK_SIZE)); BUG_ON(sizeof(struct zbudpage) > sizeof(struct page)); for (i = 0; i < NCHUNKS; i++) { diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index 7a6dd966931b..cf3001c1f407 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -1733,9 +1733,7 @@ static int __init zcache_init(void) namestr = "ramster"; ramster_register_pamops(&zcache_pamops); } -#ifdef CONFIG_DEBUG_FS zcache_debugfs_init(); -#endif if (zcache_enabled) { unsigned int cpu; -- 2.20.1