Changeset 14896

Timestamp:

08/07/10 00:02:00 (3 years ago)

Author:

BrainSlayer

Message:

smp serial fix

File:

• src/linux/laguna/linux-2.6.31.14/drivers/serial/8250.c (modified) (3 diffs)

src/linux/laguna/linux-2.6.31.14/drivers/serial/8250.c

@@ -1744 +1744 @@
         unsigned long flags;
 
+        spin_lock_irqsave(&up->port.lock, flags);
         /*
          * Must disable interrupts or else we risk racing with the interrupt
@@ -1761 +1762 @@
          * ia64 and parisc boxes.
          */
-        spin_lock_irqsave(&up->port.lock, flags);
         lsr = serial_in(up, UART_LSR);
         up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
-        spin_unlock_irqrestore(&up->port.lock, flags);
         if ((iir & UART_IIR_NO_INT) && (up->ier & UART_IER_THRI) &&
             (!uart_circ_empty(&up->port.info->xmit) || up->port.x_char) &&
@@ -1772 +1771 @@
         }
 
+        if (is_real_interrupt(up->port.irq))
+                serial_out(up, UART_IER, ier);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
         if (!(iir & UART_IIR_NO_INT))
                 serial8250_handle_port(up);
-
-        if (is_real_interrupt(up->port.irq))
-                serial_out(up, UART_IER, ier);
 
         /* Standard timer interval plus 0.2s to keep the port running */