Commit 13e83599 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds

[PATCH] lockdep: annotate serial

Teach special (dual-initialized) locking code to the lock validator.  Has no
effect on non-lockdep kernels.
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d8aa905b
...@@ -49,6 +49,12 @@ ...@@ -49,6 +49,12 @@
*/ */
static DEFINE_MUTEX(port_mutex); static DEFINE_MUTEX(port_mutex);
/*
* lockdep: port->lock is initialized in two places, but we
* want only one lock-class:
*/
static struct lock_class_key port_lock_key;
#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8)
#define uart_users(state) ((state)->count + ((state)->info ? (state)->info->blocked_open : 0)) #define uart_users(state) ((state)->count + ((state)->info ? (state)->info->blocked_open : 0))
...@@ -1865,6 +1871,7 @@ uart_set_options(struct uart_port *port, struct console *co, ...@@ -1865,6 +1871,7 @@ uart_set_options(struct uart_port *port, struct console *co,
* early. * early.
*/ */
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
lockdep_set_class(&port->lock, &port_lock_key);
memset(&termios, 0, sizeof(struct termios)); memset(&termios, 0, sizeof(struct termios));
...@@ -2247,8 +2254,10 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port) ...@@ -2247,8 +2254,10 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
* If this port is a console, then the spinlock is already * If this port is a console, then the spinlock is already
* initialised. * initialised.
*/ */
if (!(uart_console(port) && (port->cons->flags & CON_ENABLED))) if (!(uart_console(port) && (port->cons->flags & CON_ENABLED))) {
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
lockdep_set_class(&port->lock, &port_lock_key);
}
uart_configure_port(drv, state, port); uart_configure_port(drv, state, port);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment