[PATCH 15/19] UML - use __SPIN_LOCK_UNLOCKED

From: Jeff Dike
Date: Fri Apr 25 2008 - 14:04:35 EST


From: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>

Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro.

Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx>
---
arch/um/include/line.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.22/arch/um/include/line.h
===================================================================
--- linux-2.6.22.orig/arch/um/include/line.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/arch/um/include/line.h 2008-03-17 13:42:36.000000000 -0400
@@ -58,11 +58,11 @@ struct line {
};

#define LINE_INIT(str, d) \
- { .count_lock = SPIN_LOCK_UNLOCKED, \
+ { .count_lock = __SPIN_LOCK_UNLOCKED((str).count_lock), \
.init_str = str, \
.init_pri = INIT_STATIC, \
.valid = 1, \
- .lock = SPIN_LOCK_UNLOCKED, \
+ .lock = __SPIN_LOCK_UNLOCKED((str).lock), \
.driver = d }

extern void line_close(struct tty_struct *tty, struct file * filp);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/