serial: do not restore interrupt state in sysrq helper

[sfrench/cifs-2.6.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index e1b684e3384178f963dbd04f5a34d5a393d52d18..d7ed00f1594ef660f9070c164fa61b03002f9be8 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -500,19 +500,19 @@ static inline int uart_prepare_sysrq_char(struct uart_port *port, unsigned int c
        return 0;
 }
 
-static inline void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long irqflags)
+static inline void uart_unlock_and_check_sysrq(struct uart_port *port)
 {
        int sysrq_ch;
 
        if (!port->has_sysrq) {
-               spin_unlock_irqrestore(&port->lock, irqflags);
+               spin_unlock(&port->lock);
                return;
        }
 
        sysrq_ch = port->sysrq_ch;
        port->sysrq_ch = 0;
 
-       spin_unlock_irqrestore(&port->lock, irqflags);
+       spin_unlock(&port->lock);
 
        if (sysrq_ch)
                handle_sysrq(sysrq_ch);
@@ -526,9 +526,9 @@ static inline int uart_prepare_sysrq_char(struct uart_port *port, unsigned int c
 {
        return 0;
 }
-static inline void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long irqflags)
+static inline void uart_unlock_and_check_sysrq(struct uart_port *port)
 {
-       spin_unlock_irqrestore(&port->lock, irqflags);
+       spin_unlock(&port->lock);
 }
 #endif /* CONFIG_MAGIC_SYSRQ_SERIAL */