linux-next: build failure after merge of the final tree (stagingtree related)

[Stephen Rothwell]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from drivers/staging/zcache/debug.c:2:0:
drivers/staging/zcache/debug.h: In function 'dec_zcache_obj_count':
drivers/staging/zcache/debug.h:16:2: error: implicit declaration of function 'BUG_ON' [-Werror=implicit-function-declaration]

Caused by commit 95bdaee2140e ("zcache: Move debugfs code out of
zcache-main.c file").

I applied this patch for today:

From 24b03cf426007c4e94c6bed81560e436afcc136c Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 6 Mar 2013 11:31:06 +1100
Subject: [PATCH] disable ZCACHE_DEBUG due to build error

In file included from drivers/staging/zcache/debug.c:2:0:
drivers/staging/zcache/debug.h: In function 'dec_zcache_obj_count':
drivers/staging/zcache/debug.h:16:2: error: implicit declaration of function 'BUG_ON' [-Werror=implicit-function-declaration]

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/staging/zcache/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 2da6cc4..ad47b4b 100644
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -13,6 +13,7 @@ config ZCACHE
 config ZCACHE_DEBUG
 	bool "Enable debug statistics"
 	depends on DEBUG_FS && ZCACHE
+	depends on BROKEN
 	default n
 	help
 	  This is used to provide an debugfs directory with counters of
-- 
1.8.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature