| Submitter | Thomas Gleixner |
|---|---|
| Date | 2009-11-06 22:41:33 |
| Message ID | <20091106223806.682280699@linutronix.de> |
| Download | mbox | patch |
| Permalink | /patch/58235/ |
| State | New |
| Headers | show |
Comments
On Fri, Nov 06, 2009 at 10:41:33PM -0000, Thomas Gleixner wrote: >SPIN_LOCK_UNLOCKED is deprecated since quite a while. Runtime init the >locks instead. > >Signed-off-by: Thomas Gleixner <tglx@linutronix.de> >Cc: Jeff Dike <jdike@addtoit.com> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Thanks. >--- > arch/um/drivers/ubd_kern.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >Index: linux-2.6/arch/um/drivers/ubd_kern.c >=================================================================== >--- linux-2.6.orig/arch/um/drivers/ubd_kern.c >+++ linux-2.6/arch/um/drivers/ubd_kern.c >@@ -180,7 +180,6 @@ struct ubd { > .no_cow = 0, \ > .shared = 0, \ > .cow = DEFAULT_COW, \ >- .lock = SPIN_LOCK_UNLOCKED, \ > .request = NULL, \ > .start_sg = 0, \ > .end_sg = 0, \ >@@ -838,6 +837,7 @@ static int ubd_add(int n, char **error_o > > ubd_dev->size = ROUND_BLOCK(ubd_dev->size); > >+ spin_lock_init(&ubd_dev->lock); > INIT_LIST_HEAD(&ubd_dev->restart); > sg_init_table(ubd_dev->sg, MAX_SG); > > > >-- >To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >the body of a message to majordomo@vger.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html >Please read the FAQ at http://www.tux.org/lkml/
Patch
Index: linux-2.6/arch/um/drivers/ubd_kern.c =================================================================== --- linux-2.6.orig/arch/um/drivers/ubd_kern.c +++ linux-2.6/arch/um/drivers/ubd_kern.c @@ -180,7 +180,6 @@ struct ubd { .no_cow = 0, \ .shared = 0, \ .cow = DEFAULT_COW, \ - .lock = SPIN_LOCK_UNLOCKED, \ .request = NULL, \ .start_sg = 0, \ .end_sg = 0, \ @@ -838,6 +837,7 @@ static int ubd_add(int n, char **error_o ubd_dev->size = ROUND_BLOCK(ubd_dev->size); + spin_lock_init(&ubd_dev->lock); INIT_LIST_HEAD(&ubd_dev->restart); sg_init_table(ubd_dev->sg, MAX_SG);
SPIN_LOCK_UNLOCKED is deprecated since quite a while. Runtime init the locks instead. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Jeff Dike <jdike@addtoit.com> --- arch/um/drivers/ubd_kern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/