[patch 07/16] um: Replace old style lock initializer

Thomas Gleixner
2009-11-06T22:42:06Z

[-- Attachment #1: um-replace-old-style-lock-init.patch --]
[-- Type: text/plain, Size: 888 bytes --]

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(-)

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);