[PATCH 0/4] correct onstack wait_queue_head declaration

[PATCH 0/4] correct onstack wait_queue_head declaration

[Yong Zhang]

Onstack wait_queue_head must be declared with
DECLARE_WAIT_QUEUE_HEAD_ONSTACK. Otherwise it will make lockdep
warn. So fix the wrong usage in this patchset.

BTW, I split it to 4 patches to send to different maintainer
though it's due to the same issue. If you have no objection
on this kind of fix, I can also send it in one patch for some
simplification.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>

Yong Zhang (4):
      dmaengine: correct onstack wait_queue_head declaration
      [SCSI] bfa: correct onstack wait_queue_head declaration
      V4L/DVB: gspca - sn9c20x: correct onstack wait_queue_head declaration
      Staging: rt2860: correct onstack wait_queue_head declaration

 drivers/dma/dmatest.c                |    2 +-
 drivers/media/video/gspca/sn9c20x.c  |    2 +-
 drivers/scsi/bfa/bfad_im.c           |    4 ++--
 drivers/staging/rt2860/rt_main_dev.c |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

[PATCH 1/4] dmaengine: correct onstack wait_queue_head declaration

[Yong Zhang]

Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Maciej Sosnowski <maciej.sosnowski@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 drivers/dma/dmatest.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index 8b90516..948d563 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -467,7 +467,7 @@ err_srcs:
 
 	if (iterations > 0)
 		while (!kthread_should_stop()) {
-			DECLARE_WAIT_QUEUE_HEAD(wait_dmatest_exit);
+			DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait_dmatest_exit);
 			interruptible_sleep_on(&wait_dmatest_exit);
 		}
 
-- 
1.6.3.3

[PATCH 2/4] [SCSI] bfa: correct onstack wait_queue_head declaration

[Yong Zhang]

Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Jing Huang <huangj@brocade.com>
Cc: James E.J. Bottomley <James.Bottomley@suse.de>
Cc: Roel Kluin <roel.kluin@gmail.com>
Cc: linux-scsi@vger.kernel.org
---
 drivers/scsi/bfa/bfad_im.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index f788c2a..3299c7e 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -282,7 +282,7 @@ bfad_im_reset_lun_handler(struct scsi_cmnd *cmnd)
 	struct bfa_tskim_s *tskim;
 	struct bfad_itnim_s   *itnim;
 	struct bfa_itnim_s *bfa_itnim;
-	DECLARE_WAIT_QUEUE_HEAD(wq);
+	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
 	int             rc = SUCCESS;
 	unsigned long   flags;
 	enum bfi_tskim_status task_status;
@@ -344,7 +344,7 @@ bfad_im_reset_bus_handler(struct scsi_cmnd *cmnd)
 	struct bfad_itnim_s   *itnim;
 	unsigned long   flags;
 	u32        i, rc, err_cnt = 0;
-	DECLARE_WAIT_QUEUE_HEAD(wq);
+	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
 	enum bfi_tskim_status task_status;
 
 	spin_lock_irqsave(&bfad->bfad_lock, flags);
-- 
1.6.3.3

[PATCH 3/4] V4L/DVB: gspca - sn9c20x: correct onstack wait_queue_head declaration

[Yong Zhang]

Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Brian Johnson <brijohn@gmail.com>
Cc: Jean-Francois Moine <moinejf@free.fr>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-media@vger.kernel.org
---
 drivers/media/video/gspca/sn9c20x.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index 0ca1c06..8f75fbc 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -1426,7 +1426,7 @@ static int input_kthread(void *data)
 	struct gspca_dev *gspca_dev = (struct gspca_dev *)data;
 	struct sd *sd = (struct sd *) gspca_dev;
 
-	DECLARE_WAIT_QUEUE_HEAD(wait);
+	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait);
 	set_freezable();
 	for (;;) {
 		if (kthread_should_stop())
-- 
1.6.3.3

[PATCH 4/4] Staging: rt2860: correct onstack wait_queue_head declaration

[Yong Zhang]

Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: devel@driverdev.osuosl.org
---
 drivers/staging/rt2860/rt_main_dev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c
index c3d9280..fbddb00 100644
--- a/drivers/staging/rt2860/rt_main_dev.c
+++ b/drivers/staging/rt2860/rt_main_dev.c
@@ -216,7 +216,7 @@ int rt28xx_close(struct net_device *dev)
 	u32 i = 0;
 
 #ifdef RTMP_MAC_USB
-	DECLARE_WAIT_QUEUE_HEAD(unlink_wakeup);
+	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(unlink_wakeup);
 	DECLARE_WAITQUEUE(wait, current);
 #endif /* RTMP_MAC_USB // */
 
-- 
1.6.3.3

Re: [PATCH 0/4] correct onstack wait_queue_head declaration

[Peter Zijlstra]

On Fri, 2010-02-05 at 21:52 +0800, Yong Zhang wrote:
> Onstack wait_queue_head must be declared with
> DECLARE_WAIT_QUEUE_HEAD_ONSTACK. Otherwise it will make lockdep
> warn. So fix the wrong usage in this patchset.
> 
> BTW, I split it to 4 patches to send to different maintainer
> though it's due to the same issue. If you have no objection
> on this kind of fix, I can also send it in one patch for some
> simplification.
> 
> Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>

--no-chain-reply-to

Re: [PATCH 1/4] dmaengine: correct onstack wait_queue_head declaration

[Dan Williams]

On Fri, Feb 5, 2010 at 6:52 AM, Yong Zhang <yong.zhang0@gmail.com> wrote:
> Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy
>
> Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>

Thanks, applied and pushed back out on async_tx.git#fixes.

Re: [PATCH 0/4] correct onstack wait_queue_head declaration

[Yong Zhang]

On Fri, Feb 5, 2010 at 10:47 PM, Peter Zijlstra <peterz@infradead.org> wrote:
> On Fri, 2010-02-05 at 21:52 +0800, Yong Zhang wrote:
>> Onstack wait_queue_head must be declared with
>> DECLARE_WAIT_QUEUE_HEAD_ONSTACK. Otherwise it will make lockdep
>> warn. So fix the wrong usage in this patchset.
>>
>> BTW, I split it to 4 patches to send to different maintainer
>> though it's due to the same issue. If you have no objection
>> on this kind of fix, I can also send it in one patch for some
>> simplification.
>>
>> Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
>
> --no-chain-reply-to

Thanks for your reminder.  :)

Regards,
Yong