Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7259f0d0 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate DECLARE_WAIT_QUEUE_HEAD 



kernel: INFO: trying to register non-static key.
kernel: the code is fine but needs lockdep annotation.
kernel: turning off the locking correctness validator.
kernel:  [<c04051ed>] show_trace_log_lvl+0x58/0x16a
kernel:  [<c04057fa>] show_trace+0xd/0x10
kernel:  [<c0405913>] dump_stack+0x19/0x1b
kernel:  [<c043b1e2>] __lock_acquire+0xf0/0x90d
kernel:  [<c043bf70>] lock_acquire+0x4b/0x6b
kernel:  [<c061472f>] _spin_lock_irqsave+0x22/0x32
kernel:  [<c04363d3>] prepare_to_wait+0x17/0x4b
kernel:  [<f89a24b6>] lpfc_do_work+0xdd/0xcc2 [lpfc]
kernel:  [<c04361b9>] kthread+0xc3/0xf2
kernel:  [<c0402005>] kernel_thread_helper+0x5/0xb

Another case of non-static lockdep keys; duplicate the paradigm set by
DECLARE_COMPLETION_ONSTACK and introduce DECLARE_WAIT_QUEUE_HEAD_ONSTACK.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Greg KH <gregkh@suse.de>
Cc: Markus Lidel <markus.lidel@shadowconnect.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 70812522

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static void bluecard_write_wakeup(bluecard_info_t *info) 
		clear_bit(ready_bit, &(info->tx_state));



		if (bt_cb(skb)->pkt_type & 0x80) {

			DECLARE_WAIT_QUEUE_HEAD(wq);

			DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);

			DEFINE_WAIT(wait);



			unsigned char baud_reg;

drivers/message/i2o/exec-osm.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void i2o_exec_wait_free(struct i2o_exec_wait *wait) 
int i2o_msg_post_wait_mem(struct i2o_controller *c, struct i2o_message *msg,

			  unsigned long timeout, struct i2o_dma *dma)

{

	DECLARE_WAIT_QUEUE_HEAD(wq);

	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);

	struct i2o_exec_wait *wait;

	static u32 tcntxt = 0x80000000;

	unsigned long flags;

drivers/scsi/dpt/dpti_i2o.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 


#include <linux/wait.h>

typedef wait_queue_head_t adpt_wait_queue_head_t;

#define ADPT_DECLARE_WAIT_QUEUE_HEAD(wait) DECLARE_WAIT_QUEUE_HEAD(wait)

#define ADPT_DECLARE_WAIT_QUEUE_HEAD(wait) DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait)

typedef wait_queue_t adpt_wait_queue_t;



/*

drivers/scsi/imm.c

+1 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ static int __imm_attach(struct parport *pb) 
{

	struct Scsi_Host *host;

	imm_struct *dev;

	DECLARE_WAIT_QUEUE_HEAD(waiting);

	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waiting);

	DEFINE_WAIT(wait);

	int ports;

	int modes, ppb;

drivers/scsi/lpfc/lpfc_hbadisc.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ lpfc_do_work(void *p) 
{

	struct lpfc_hba *phba = p;

	int rc;

	DECLARE_WAIT_QUEUE_HEAD(work_waitq);

	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(work_waitq);



	set_user_nice(current, -20);

	phba->work_wait = &work_waitq;