Re: [GIT PULL] block drivers for 2.6.39-rc

From: Stephen Rothwell
Date: Mon Mar 28 2011 - 01:08:26 EST


Hi Linus, Ingo,

On Sun, 27 Mar 2011 21:37:50 -0700 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Sun, Mar 27, 2011 at 9:23 PM, Ingo Molnar <mingo@xxxxxxx> wrote:
> >
> > This driver does not build at all:
> >
> > Âdrivers/block/drbd/drbd_bitmap.c:1187:5: error: implicit declaration of function âgeneric_find_next_zero_le_bitâ [-Werror=implicit-function-declaration]
> > Âdrivers/block/drbd/drbd_bitmap.c:1190:5: error: implicit declaration of function âgeneric_find_next_le_bitâ [-Werror=implicit-function-declaration]
> > Âdrivers/block/drbd/drbd_bitmap.c:1290:4: error: implicit declaration of function âgeneric___test_and_set_le_bitâ [-Werror=implicit-function-declaration]
> > Âdrivers/block/drbd/drbd_bitmap.c:1292:4: error: implicit declaration of function âgeneric___test_and_clear_le_bitâ [-Werror=implicit-function-declaration]
> > Âdrivers/block/drbd/drbd_bitmap.c:1441:3: error: implicit declaration of function âgeneric_test_le_bitâ [-Werror=implicit-function-declaration]
> >
> > Has this been build-tested? These APIs do not exist upstream.
>
> Actually, I think that's just a merge error - those horrible nasty
> crazy names did use to exist.
>
> Does this fix it? (Untested!)

You also need to remove the include of asm-generic/bitops/le.h from that
file now (the easiest way is to revert commit f0ff1357ce39 ("drbd: need
include for bitops functions declarations").

Jens was informed about these problems when they appeared in linux-next.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature