git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
serial
/
sn_console.c
diff --git
a/drivers/serial/sn_console.c
b/drivers/serial/sn_console.c
index
60ea4a3
..
253ceb8
100644
(file)
--- a/
drivers/serial/sn_console.c
+++ b/
drivers/serial/sn_console.c
@@
-37,7
+37,6
@@
* http://oss.sgi.com/projects/GenInfo/NoticeExplan
*/
* http://oss.sgi.com/projects/GenInfo/NoticeExplan
*/
-#include <linux/config.h>
#include <linux/interrupt.h>
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/interrupt.h>
#include <linux/tty.h>
#include <linux/serial.h>
@@
-362,8
+361,8
@@
static int snp_startup(struct uart_port *port)
*
*/
static void
*
*/
static void
-snp_set_termios(struct uart_port *port, struct termios *termios,
- struct termios *old)
+snp_set_termios(struct uart_port *port, struct
k
termios *termios,
+ struct
k
termios *old)
{
}
{
}
@@
-448,7
+447,6
@@
static int sn_debug_printf(const char *fmt, ...)
/**
* sn_receive_chars - Grab characters, pass them to tty layer
* @port: Port to operate on
/**
* sn_receive_chars - Grab characters, pass them to tty layer
* @port: Port to operate on
- * @regs: Saved registers (needed by uart_handle_sysrq_char)
* @flags: irq flags
*
* Note: If we're not registered with the serial core infrastructure yet,
* @flags: irq flags
*
* Note: If we're not registered with the serial core infrastructure yet,
@@
-456,8
+454,7
@@
static int sn_debug_printf(const char *fmt, ...)
*
*/
static void
*
*/
static void
-sn_receive_chars(struct sn_cons_port *port, struct pt_regs *regs,
- unsigned long flags)
+sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
{
int ch;
struct tty_struct *tty;
{
int ch;
struct tty_struct *tty;
@@
-495,7
+492,7
@@
sn_receive_chars(struct sn_cons_port *port, struct pt_regs *regs,
sysrq_requested = 0;
if (ch && time_before(jiffies, sysrq_timeout)) {
spin_unlock_irqrestore(&port->sc_port.lock, flags);
sysrq_requested = 0;
if (ch && time_before(jiffies, sysrq_timeout)) {
spin_unlock_irqrestore(&port->sc_port.lock, flags);
- handle_sysrq(ch,
regs,
NULL);
+ handle_sysrq(ch, NULL);
spin_lock_irqsave(&port->sc_port.lock, flags);
/* ignore actual sysrq command char */
continue;
spin_lock_irqsave(&port->sc_port.lock, flags);
/* ignore actual sysrq command char */
continue;
@@
-616,10
+613,9
@@
static void sn_transmit_chars(struct sn_cons_port *port, int raw)
* sn_sal_interrupt - Handle console interrupts
* @irq: irq #, useful for debug statements
* @dev_id: our pointer to our port (sn_cons_port which contains the uart port)
* sn_sal_interrupt - Handle console interrupts
* @irq: irq #, useful for debug statements
* @dev_id: our pointer to our port (sn_cons_port which contains the uart port)
- * @regs: Saved registers, used by sn_receive_chars for uart_handle_sysrq_char
*
*/
*
*/
-static irqreturn_t sn_sal_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t sn_sal_interrupt(int irq, void *dev_id)
{
struct sn_cons_port *port = (struct sn_cons_port *)dev_id;
unsigned long flags;
{
struct sn_cons_port *port = (struct sn_cons_port *)dev_id;
unsigned long flags;
@@
-630,7
+626,7
@@
static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
spin_lock_irqsave(&port->sc_port.lock, flags);
if (status & SAL_CONSOLE_INTR_RECV) {
spin_lock_irqsave(&port->sc_port.lock, flags);
if (status & SAL_CONSOLE_INTR_RECV) {
- sn_receive_chars(port,
regs,
flags);
+ sn_receive_chars(port, flags);
}
if (status & SAL_CONSOLE_INTR_XMIT) {
sn_transmit_chars(port, TRANSMIT_BUFFERED);
}
if (status & SAL_CONSOLE_INTR_XMIT) {
sn_transmit_chars(port, TRANSMIT_BUFFERED);
@@
-649,7
+645,7
@@
static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static int sn_sal_connect_interrupt(struct sn_cons_port *port)
{
if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
static int sn_sal_connect_interrupt(struct sn_cons_port *port)
{
if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
-
SA_INTERRUPT | SA_SHIRQ
,
+
IRQF_DISABLED | IRQF_SHARED
,
"SAL console driver", port) >= 0) {
return SGI_UART_VECTOR;
}
"SAL console driver", port) >= 0) {
return SGI_UART_VECTOR;
}
@@
-678,7
+674,7
@@
static void sn_sal_timer_poll(unsigned long data)
if (!port->sc_port.irq) {
spin_lock_irqsave(&port->sc_port.lock, flags);
if (sn_process_input)
if (!port->sc_port.irq) {
spin_lock_irqsave(&port->sc_port.lock, flags);
if (sn_process_input)
- sn_receive_chars(port,
NULL,
flags);
+ sn_receive_chars(port, flags);
sn_transmit_chars(port, TRANSMIT_RAW);
spin_unlock_irqrestore(&port->sc_port.lock, flags);
mod_timer(&port->sc_timer,
sn_transmit_chars(port, TRANSMIT_RAW);
spin_unlock_irqrestore(&port->sc_port.lock, flags);
mod_timer(&port->sc_timer,