linux-next: build warnings after merge of the akpm tree

[Stephen Rothwell]

Hi Andrew,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) produced these warnings:

In file included from drivers/block/drbd/drbd_bitmap.c:32:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_receiver.c:46:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_proc.c:34:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_worker.c:38:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_actlog.c:31:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_req.c:30:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition

Introduced by the interaction of commit c1fd29a11f43 ("drbd: Fix a race
condition that can lead to a BUG()") from the block tree and commit
"wait: add wait_event_lock_irq() interface" from the akpm tree.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature