tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge master.kernel.org:/home/rmk/linux-2.6-serial

Linus Torvalds 08ab8c20 10e047b4

+13 -1
+13 -1
drivers/serial/serial_core.c
··· 1808 1808 struct termios termios; 1809 1809 int i; 1810 1810 1811 + /* 1812 + * Ensure that the serial console lock is initialised 1813 + * early. 1814 + */ 1815 + spin_lock_init(&port->lock); 1816 + 1811 1817 memset(&termios, 0, sizeof(struct termios)); 1812 1818 1813 1819 termios.c_cflag = CREAD | HUPCL | CLOCAL; ··· 2202 2196 2203 2197 state->port = port; 2204 2198 2205 - spin_lock_init(&port->lock); 2206 2199 port->cons = drv->cons; 2207 2200 port->info = state->info; 2201 + 2202 + /* 2203 + * If this port is a console, then the spinlock is already 2204 + * initialised. 2205 + */ 2206 + if (!uart_console(port)) 2207 + spin_lock_init(&port->lock); 2208 2208 2209 2209 uart_configure_port(drv, state, port); 2210 2210