[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120228165857.5abb225e1748d40f9c5d61e8@canb.auug.org.au>
Date: Tue, 28 Feb 2012 16:58:57 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Akinobu Mita <akinobu.mita@...il.com>
Subject: linux-next: build failure after merge of the akpm tree
Hi Andrew,
After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/base/regmap/regcache-lzo.c: In function 'regcache_lzo_sync':
drivers/base/regmap/regcache-lzo.c:344:2: error: implicit declaration of function 'for_each_set_bit_cont' [-Werror=implicit-function-declaration]
drivers/base/regmap/regcache-lzo.c:345:41: error: expected ';' before '{' token
drivers/base/regmap/regcache-lzo.c:340:6: warning: unused variable 'ret' [-Wunused-variable]
drivers/base/regmap/regcache-lzo.c:338:15: warning: unused variable 'val' [-Wunused-variable]
drivers/base/regmap/regcache-lzo.c:368:1: warning: no return statement in function returning non-void [-Wreturn-type]
Caused by commits ac8d91c80190 ("regmap: Supply ranges to the sync
operations" and a0941e562e80 ("regmap: Fix x86_64 breakage") from the
regmap tree interacting with commits "bitops: rename for_each_set_bit_cont()
in favor of analogous list.h function" and "bitops: remove
for_each_set_bit_cont()" from the akpm tree.
I have applied this fix up patch:
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 28 Feb 2012 16:15:35 +1100
Subject: [PATCH] regmap: cope with bitops API change (for_each_set_bit_cont)
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
drivers/base/regmap/regcache-lzo.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index 8d00615..77dc532 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -341,7 +341,7 @@ static int regcache_lzo_sync(struct regmap *map, unsigned int min,
lzo_blocks = map->cache;
i = min;
- for_each_set_bit_cont(i, lzo_blocks[0]->sync_bmp,
+ for_each_set_bit_from(i, lzo_blocks[0]->sync_bmp,
lzo_blocks[0]->sync_bmp_nbits) {
if (i > max)
continue;
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists