[PATCH] slab debug and ARCH_SLAB_MINALIGN don't get along

[linux-2.6-omap-h63xx.git] / drivers / serial / amba-pl010.c

diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 1631414000a2c738bd38f10beb05e81f47ead172..4213fabc62bf864a033aca5ff1c5b120b830cf57 100644 (file)
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -31,7 +31,6 @@
  * required, these have to be supplied via some other means (eg, GPIO)
  * and hooked into this driver.
  */
-#include <linux/config.h>
 
 #if defined(CONFIG_SERIAL_AMBA_PL010_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
@@ -52,7 +51,7 @@
 
 #include <asm/io.h>
 
-#define UART_NR                2
+#define UART_NR                8
 
 #define SERIAL_AMBA_MAJOR      204
 #define SERIAL_AMBA_MINOR      16
@@ -112,12 +111,7 @@ static void pl010_enable_ms(struct uart_port *port)
        writel(cr, port->membase + UART010_CR);
 }
 
-static void
-#ifdef SUPPORT_SYSRQ
-pl010_rx_chars(struct uart_port *port, struct pt_regs *regs)
-#else
-pl010_rx_chars(struct uart_port *port)
-#endif
+static void pl010_rx_chars(struct uart_port *port)
 {
        struct tty_struct *tty = port->info->tty;
        unsigned int status, ch, flag, rsr, max_count = 256;
@@ -157,7 +151,7 @@ pl010_rx_chars(struct uart_port *port)
                                flag = TTY_FRAME;
                }
 
-               if (uart_handle_sysrq_char(port, ch, regs))
+               if (uart_handle_sysrq_char(port, ch))
                        goto ignore_char;
 
                uart_insert_char(port, rsr, UART01x_RSR_OE, ch, flag);
@@ -228,7 +222,7 @@ static void pl010_modem_status(struct uart_port *port)
        wake_up_interruptible(&uap->port.info->delta_msr_wait);
 }
 
-static irqreturn_t pl010_int(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t pl010_int(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
        unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT;
@@ -240,11 +234,7 @@ static irqreturn_t pl010_int(int irq, void *dev_id, struct pt_regs *regs)
        if (status) {
                do {
                        if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))
-#ifdef SUPPORT_SYSRQ
-                               pl010_rx_chars(port, regs);
-#else
                                pl010_rx_chars(port);
-#endif
                        if (status & UART010_IIR_MIS)
                                pl010_modem_status(port);
                        if (status & UART010_IIR_TIS)