From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx191.postini.com [74.125.245.191]) by kanga.kvack.org (Postfix) with SMTP id C09F16B0002 for ; Sun, 31 Mar 2013 23:50:55 -0400 (EDT) Received: by mail-pb0-f53.google.com with SMTP id un1so989805pbc.12 for ; Sun, 31 Mar 2013 20:50:55 -0700 (PDT) From: Bob Liu Subject: [PATCH] staging: zcache: fix compile error Date: Mon, 1 Apr 2013 11:50:47 +0800 Message-Id: <1364788247-30657-1-git-send-email-bob.liu@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: gregkh@linuxfoundation.org Cc: konrad.wilk@oracle.com, dan.magenheimer@oracle.com, fengguang.wu@intel.com, linux-mm@kvack.org, Bob Liu Because 'ramster_debugfs_init' is not defined if !CONFIG_DEBUG_FS, there is compile error like: $ make drivers/staging/zcache/ staging/zcache/zbud.c:291:16: warning: a??zbud_pers_evicted_pageframesa?? defined but not used [-Wunused-variable] staging/zcache/ramster/ramster.c: In function a??ramster_inita??: staging/zcache/ramster/ramster.c:981:2: error: implicit declaration of function a??ramster_debugfs_inita?? [-Werror=implicit-function-declaration] This patch fix it and reduce some #ifdef CONFIG_DEBUG_FS in .c files with the same way. Reported-by: Fengguang Wu Signed-off-by: Bob Liu --- drivers/staging/zcache/ramster/ramster.c | 4 ++++ drivers/staging/zcache/zbud.c | 6 ++++-- drivers/staging/zcache/zcache-main.c | 2 -- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/staging/zcache/ramster/ramster.c b/drivers/staging/zcache/ramster/ramster.c index 4f715c7..e562c14 100644 --- a/drivers/staging/zcache/ramster/ramster.c +++ b/drivers/staging/zcache/ramster/ramster.c @@ -134,6 +134,10 @@ static int ramster_debugfs_init(void) } #undef zdebugfs #undef zdfs64 +#else +static int ramster_debugfs_init(void) +{ +} #endif static LIST_HEAD(ramster_rem_op_list); diff --git a/drivers/staging/zcache/zbud.c b/drivers/staging/zcache/zbud.c index fdff5c6..2d38c96 100644 --- a/drivers/staging/zcache/zbud.c +++ b/drivers/staging/zcache/zbud.c @@ -342,6 +342,10 @@ static int zbud_debugfs_init(void) } #undef zdfs #undef zdfs64 +#else +static int zbud_debugfs_init(void) +{ +} #endif /* protects the buddied list and all unbuddied lists */ @@ -1051,9 +1055,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 4e52a94..ac75670 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -1753,9 +1753,7 @@ static int zcache_init(void) namestr = "ramster"; ramster_register_pamops(&zcache_pamops); } -#ifdef CONFIG_DEBUG_FS zcache_debugfs_init(); -#endif if (zcache_enabled) { unsigned int cpu; -- 1.7.10.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org