lkml.org 
[lkml]   [2006]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 36/61] lock validator: special locking: serial
    From: Ingo Molnar <mingo@elte.hu>

    teach special (dual-initialized) locking code to the lock validator.
    Has no effect on non-lockdep kernels.

    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    ---
    ---
    drivers/serial/serial_core.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    Index: linux/drivers/serial/serial_core.c
    ===================================================================
    --- linux.orig/drivers/serial/serial_core.c
    +++ linux/drivers/serial/serial_core.c
    @@ -1849,6 +1849,12 @@ static const struct baud_rates baud_rate
    { 0, B38400 }
    };

    +/*
    + * lockdep: port->lock is initialized in two places, but we
    + * want only one lock-type:
    + */
    +static struct lockdep_type_key port_lock_key;
    +
    /**
    * uart_set_options - setup the serial console parameters
    * @port: pointer to the serial ports uart_port structure
    @@ -1869,7 +1875,7 @@ uart_set_options(struct uart_port *port,
    * Ensure that the serial console lock is initialised
    * early.
    */
    - spin_lock_init(&port->lock);
    + spin_lock_init_key(&port->lock, &port_lock_key);

    memset(&termios, 0, sizeof(struct termios));

    @@ -2255,7 +2261,7 @@ int uart_add_one_port(struct uart_driver
    * initialised.
    */
    if (!(uart_console(port) && (port->cons->flags & CON_ENABLED)))
    - spin_lock_init(&port->lock);
    + spin_lock_init_key(&port->lock, &port_lock_key);

    uart_configure_port(drv, state, port);

    -
    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/
    \
     
     \ /
      Last update: 2006-05-29 23:40    [W:0.021 / U:30.716 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site