17 files changed, 219 insertions, 70 deletions

diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index e7ba774beda6..25373df1dcf8 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -566,6 +566,7 @@ static ssize_t ac_read (struct file *filp, char __user *buf, size_t count, loff_
                                 struct mailbox mailbox;
 
                                 /* Got a packet for us */
+                                memset(&st_loc, 0, sizeof(st_loc));
                                 ret = do_ac_read(i, buf, &st_loc, &mailbox);
                                 spin_unlock_irqrestore(&apbs[i].mutex, flags);
                                 set_current_state(TASK_RUNNING);
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 3afd62e856eb..e9cba13ee800 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -713,7 +713,6 @@ static int khvcd(void *unused)
         struct hvc_struct *hp;
 
         set_freezable();
-        __set_current_state(TASK_RUNNING);
         do {
                 poll_mask = 0;
                 hvc_kicked = 0;
diff --git a/drivers/char/ip2/Makefile b/drivers/char/ip2/Makefile
index bc397d92b499..7b78e0dfc5b0 100644
--- a/drivers/char/ip2/Makefile
+++ b/drivers/char/ip2/Makefile
@@ -4,5 +4,5 @@
 
 obj-$(CONFIG_COMPUTONE)         += ip2.o
 
-ip2-objs                        := ip2main.o
+ip2-y                   := ip2main.o
 
diff --git a/drivers/char/ipmi/Makefile b/drivers/char/ipmi/Makefile
index eb8a1a8c188e..16a93648d54e 100644
--- a/drivers/char/ipmi/Makefile
+++ b/drivers/char/ipmi/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the ipmi drivers.
 #
 
-ipmi_si-objs := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o
+ipmi_si-y := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o
 
 obj-$(CONFIG_IPMI_HANDLER) += ipmi_msghandler.o
 obj-$(CONFIG_IPMI_DEVICE_INTERFACE) += ipmi_devintf.o
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 1fc8876af1f5..2aa3977aae5e 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -916,7 +916,7 @@ static struct ipmi_smi_watcher smi_watcher =
         .smi_gone = ipmi_smi_gone,
 };
 
-static __init int init_ipmi_devintf(void)
+static int __init init_ipmi_devintf(void)
 {
         int rv;
 
@@ -954,7 +954,7 @@ static __init int init_ipmi_devintf(void)
 }
 module_init(init_ipmi_devintf);
 
-static __exit void cleanup_ipmi(void)
+static void __exit cleanup_ipmi(void)
 {
         struct ipmi_reg_list *entry, *entry2;
         mutex_lock(&reg_list_mutex);
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 4f3f8c9ec262..2fe72f8edf44 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -4442,13 +4442,13 @@ static int ipmi_init_msghandler(void)
         return 0;
 }
 
-static __init int ipmi_init_msghandler_mod(void)
+static int __init ipmi_init_msghandler_mod(void)
 {
         ipmi_init_msghandler();
         return 0;
 }
 
-static __exit void cleanup_ipmi(void)
+static void __exit cleanup_ipmi(void)
 {
         int count;
 
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index b293d57d30a7..035da9e64a17 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1846,7 +1846,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
         return rv;
 }
 
-static __devinit void hardcode_find_bmc(void)
+static void __devinit hardcode_find_bmc(void)
 {
         int             i;
         struct smi_info *info;
@@ -2029,7 +2029,7 @@ struct SPMITable {
         s8      spmi_id[1]; /* A '\0' terminated array starts here. */
 };
 
-static __devinit int try_init_spmi(struct SPMITable *spmi)
+static int __devinit try_init_spmi(struct SPMITable *spmi)
 {
         struct smi_info  *info;
 
@@ -2112,7 +2112,7 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
         return 0;
 }
 
-static __devinit void spmi_find_bmc(void)
+static void __devinit spmi_find_bmc(void)
 {
         acpi_status      status;
         struct SPMITable *spmi;
@@ -2325,7 +2325,7 @@ static int __devinit decode_dmi(const struct dmi_header *dm,
         return 0;
 }
 
-static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
+static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data)
 {
         struct smi_info *info;
 
@@ -3012,7 +3012,7 @@ static __devinitdata struct ipmi_default_vals
         { .port = 0 }
 };
 
-static __devinit void default_find_bmc(void)
+static void __devinit default_find_bmc(void)
 {
         struct smi_info *info;
         int             i;
@@ -3312,7 +3312,7 @@ static int try_smi_init(struct smi_info *new_smi)
         return rv;
 }
 
-static __devinit int init_ipmi_si(void)
+static int __devinit init_ipmi_si(void)
 {
         int  i;
         char *str;
@@ -3525,7 +3525,7 @@ static void cleanup_one_si(struct smi_info *to_clean)
         kfree(to_clean);
 }
 
-static __exit void cleanup_ipmi_si(void)
+static void __exit cleanup_ipmi_si(void)
 {
         struct smi_info *e, *tmp_e;
 
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index c070b53984e4..e6d75627c6c8 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -176,9 +176,9 @@ static void mmtimer_setup_int_2(int cpu, u64 expires)
  * in order to insure that the setup succeeds in a deterministic time frame.
  * It will check if the interrupt setup succeeded.
  */
-static int mmtimer_setup(int cpu, int comparator, unsigned long expires)
+static int mmtimer_setup(int cpu, int comparator, unsigned long expires,
+        u64 *set_completion_time)
 {
-
         switch (comparator) {
         case 0:
                 mmtimer_setup_int_0(cpu, expires);
@@ -191,7 +191,8 @@ static int mmtimer_setup(int cpu, int comparator, unsigned long expires)
                 break;
         }
         /* We might've missed our expiration time */
-        if (rtc_time() <= expires)
+        *set_completion_time = rtc_time();
+        if (*set_completion_time <= expires)
                 return 1;
 
         /*
@@ -227,6 +228,8 @@ static int mmtimer_disable_int(long nasid, int comparator)
 #define TIMER_OFF       0xbadcabLL      /* Timer is not setup */
 #define TIMER_SET       0               /* Comparator is set for this timer */
 
+#define MMTIMER_INTERVAL_RETRY_INCREMENT_DEFAULT 40
+
 /* There is one of these for each timer */
 struct mmtimer {
         struct rb_node list;
@@ -242,6 +245,11 @@ struct mmtimer_node {
 };
 static struct mmtimer_node *timers;
 
+static unsigned mmtimer_interval_retry_increment =
+        MMTIMER_INTERVAL_RETRY_INCREMENT_DEFAULT;
+module_param(mmtimer_interval_retry_increment, uint, 0644);
+MODULE_PARM_DESC(mmtimer_interval_retry_increment,
+        "RTC ticks to add to expiration on interval retry (default 40)");
 
 /*
  * Add a new mmtimer struct to the node's mmtimer list.
@@ -289,7 +297,8 @@ static void mmtimer_set_next_timer(int nodeid)
         struct mmtimer_node *n = &timers[nodeid];
         struct mmtimer *x;
         struct k_itimer *t;
-        int o;
+        u64 expires, exp, set_completion_time;
+        int i;
 
 restart:
         if (n->next == NULL)
@@ -300,7 +309,8 @@ restart:
         if (!t->it.mmtimer.incr) {
                 /* Not an interval timer */
                 if (!mmtimer_setup(x->cpu, COMPARATOR,
-                                        t->it.mmtimer.expires)) {
+                                        t->it.mmtimer.expires,
+                                        &set_completion_time)) {
                         /* Late setup, fire now */
                         tasklet_schedule(&n->tasklet);
                 }
@@ -308,14 +318,23 @@ restart:
         }
 
         /* Interval timer */
-        o = 0;
-        while (!mmtimer_setup(x->cpu, COMPARATOR, t->it.mmtimer.expires)) {
-                unsigned long e, e1;
-                struct rb_node *next;
-                t->it.mmtimer.expires += t->it.mmtimer.incr << o;
-                t->it_overrun += 1 << o;
-                o++;
-                if (o > 20) {
+        i = 0;
+        expires = exp = t->it.mmtimer.expires;
+        while (!mmtimer_setup(x->cpu, COMPARATOR, expires,
+                                &set_completion_time)) {
+                int to;
+
+                i++;
+                expires = set_completion_time +
+                                mmtimer_interval_retry_increment + (1 << i);
+                /* Calculate overruns as we go. */
+                to = ((u64)(expires - exp) / t->it.mmtimer.incr);
+                if (to) {
+                        t->it_overrun += to;
+                        t->it.mmtimer.expires += t->it.mmtimer.incr * to;
+                        exp = t->it.mmtimer.expires;
+                }
+                if (i > 20) {
                         printk(KERN_ALERT "mmtimer: cannot reschedule timer\n");
                         t->it.mmtimer.clock = TIMER_OFF;
                         n->next = rb_next(&x->list);
@@ -323,21 +342,6 @@ restart:
                         kfree(x);
                         goto restart;
                 }
-
-                e = t->it.mmtimer.expires;
-                next = rb_next(&x->list);
-
-                if (next == NULL)
-                        continue;
-
-                e1 = rb_entry(next, struct mmtimer, list)->
-                        timer->it.mmtimer.expires;
-                if (e > e1) {
-                        n->next = next;
-                        rb_erase(&x->list, &n->timer_head);
-                        mmtimer_add_list(x);
-                        goto restart;
-                }
         }
 }
 
diff --git a/drivers/char/mwave/Makefile b/drivers/char/mwave/Makefile
index 754c9e2058ed..26b4fce217b6 100644
--- a/drivers/char/mwave/Makefile
+++ b/drivers/char/mwave/Makefile
@@ -6,10 +6,10 @@
 
 obj-$(CONFIG_MWAVE) += mwave.o
 
-mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o
+mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o
 
 # To have the mwave driver disable other uarts if necessary
 # EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
 
 # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
-EXTRA_CFLAGS += -DMW_TRACE
+ccflags-y := -DMW_TRACE
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 463df27494bd..dd9d75351cd6 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -303,6 +303,7 @@ static void mxser_enable_must_enchance_mode(unsigned long baseio)
         outb(oldlcr, baseio + UART_LCR);
 }
 
+#ifdef  CONFIG_PCI
 static void mxser_disable_must_enchance_mode(unsigned long baseio)
 {
         u8 oldlcr;
@@ -317,6 +318,7 @@ static void mxser_disable_must_enchance_mode(unsigned long baseio)
         outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
         outb(oldlcr, baseio + UART_LCR);
 }
+#endif
 
 static void mxser_set_must_xon1_value(unsigned long baseio, u8 value)
 {
@@ -388,6 +390,7 @@ static void mxser_set_must_enum_value(unsigned long baseio, u8 value)
         outb(oldlcr, baseio + UART_LCR);
 }
 
+#ifdef CONFIG_PCI
 static void mxser_get_must_hardware_id(unsigned long baseio, u8 *pId)
 {
         u8 oldlcr;
@@ -404,6 +407,7 @@ static void mxser_get_must_hardware_id(unsigned long baseio, u8 *pId)
         *pId = inb(baseio + MOXA_MUST_HWID_REGISTER);
         outb(oldlcr, baseio + UART_LCR);
 }
+#endif
 
 static void SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(unsigned long baseio)
 {
diff --git a/drivers/char/pcmcia/ipwireless/Makefile b/drivers/char/pcmcia/ipwireless/Makefile
index b71eb593643d..db80873d7f20 100644
--- a/drivers/char/pcmcia/ipwireless/Makefile
+++ b/drivers/char/pcmcia/ipwireless/Makefile
@@ -6,5 +6,5 @@
 
 obj-$(CONFIG_IPWIRELESS) += ipwireless.o
 
-ipwireless-objs := hardware.o main.o network.o tty.o
+ipwireless-y := hardware.o main.o network.o tty.o
 
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 723152d978a9..f176dbaeb15a 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -613,6 +613,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
         case PPGETTIME:
                 to_jiffies = pp->pdev->timeout;
+                memset(&par_timeout, 0, sizeof(par_timeout));
                 par_timeout.tv_sec = to_jiffies / HZ;
                 par_timeout.tv_usec = (to_jiffies % (long)HZ) * (1000000/HZ);
                 if (copy_to_user (argp, &par_timeout, sizeof(struct timeval)))
diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c
index 74f00b5ffa36..73dcb0ee41fd 100644
--- a/drivers/char/ramoops.c
+++ b/drivers/char/ramoops.c
@@ -25,6 +25,8 @@
 #include <linux/time.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/ramoops.h>
 
 #define RAMOOPS_KERNMSG_HDR "===="
 #define RAMOOPS_HEADER_SIZE   (5 + sizeof(struct timeval))
@@ -91,11 +93,17 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,
         cxt->count = (cxt->count + 1) % cxt->max_count;
 }
 
-static int __init ramoops_init(void)
+static int __init ramoops_probe(struct platform_device *pdev)
 {
+        struct ramoops_platform_data *pdata = pdev->dev.platform_data;
         struct ramoops_context *cxt = &oops_cxt;
         int err = -EINVAL;
 
+        if (pdata) {
+                mem_size = pdata->mem_size;
+                mem_address = pdata->mem_address;
+        }
+
         if (!mem_size) {
                 printk(KERN_ERR "ramoops: invalid size specification");
                 goto fail3;
@@ -142,7 +150,7 @@ fail3:
         return err;
 }
 
-static void __exit ramoops_exit(void)
+static int __exit ramoops_remove(struct platform_device *pdev)
 {
         struct ramoops_context *cxt = &oops_cxt;
 
@@ -151,8 +159,26 @@ static void __exit ramoops_exit(void)
 
         iounmap(cxt->virt_addr);
         release_mem_region(cxt->phys_addr, cxt->size);
+        return 0;
 }
 
+static struct platform_driver ramoops_driver = {
+        .remove         = __exit_p(ramoops_remove),
+        .driver         = {
+                .name   = "ramoops",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init ramoops_init(void)
+{
+        return platform_driver_probe(&ramoops_driver, ramoops_probe);
+}
+
+static void __exit ramoops_exit(void)
+{
+        platform_driver_unregister(&ramoops_driver);
+}
 
 module_init(ramoops_init);
 module_exit(ramoops_exit);
diff --git a/drivers/char/rio/Makefile b/drivers/char/rio/Makefile
index 2d1c5a7cba7d..1661875883fb 100644
--- a/drivers/char/rio/Makefile
+++ b/drivers/char/rio/Makefile
@@ -8,5 +8,5 @@
 
 obj-$(CONFIG_RIO) += rio.o
 
-rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
+rio-y := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
             rioparam.o rioroute.o riotable.o riotty.o
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 7c79d243acc9..86308830ac42 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -2345,7 +2345,7 @@ static int __init rp_init(void)
         ret = tty_register_driver(rocket_driver);
         if (ret < 0) {
                 printk(KERN_ERR "Couldn't install tty RocketPort driver\n");
-                goto err_tty;
+                goto err_controller;
         }
 
 #ifdef ROCKET_DEBUG_OPEN
@@ -2380,6 +2380,9 @@ static int __init rp_init(void)
         return 0;
 err_ttyu:
         tty_unregister_driver(rocket_driver);
+err_controller:
+        if (controller)
+                release_region(controller, 4);
 err_tty:
         put_tty_driver(rocket_driver);
 err:
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 1746d91205f7..d01fffeac951 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -301,6 +301,8 @@ struct slgt_info {
         unsigned int rx_pio;
         unsigned int if_mode;
         unsigned int base_clock;
+        unsigned int xsync;
+        unsigned int xctrl;
 
         /* device status */
 
@@ -405,6 +407,8 @@ static MGSL_PARAMS default_params = {
 #define TDCSR 0x94 /* tx DMA control/status */
 #define RDDAR 0x98 /* rx DMA descriptor address */
 #define TDDAR 0x9c /* tx DMA descriptor address */
+#define XSR   0x40 /* extended sync pattern */
+#define XCR   0x44 /* extended control */
 
 #define RXIDLE      BIT14
 #define RXBREAK     BIT14
@@ -517,6 +521,10 @@ static int  set_interface(struct slgt_info *info, int if_mode);
 static int  set_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
 static int  get_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
 static int  wait_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
+static int  get_xsync(struct slgt_info *info, int __user *if_mode);
+static int  set_xsync(struct slgt_info *info, int if_mode);
+static int  get_xctrl(struct slgt_info *info, int __user *if_mode);
+static int  set_xctrl(struct slgt_info *info, int if_mode);
 
 /*
  * driver functions
@@ -1056,6 +1064,14 @@ static int ioctl(struct tty_struct *tty, struct file *file,
                 return get_gpio(info, argp);
         case MGSL_IOCWAITGPIO:
                 return wait_gpio(info, argp);
+        case MGSL_IOCGXSYNC:
+                return get_xsync(info, argp);
+        case MGSL_IOCSXSYNC:
+                return set_xsync(info, (int)arg);
+        case MGSL_IOCGXCTRL:
+                return get_xctrl(info, argp);
+        case MGSL_IOCSXCTRL:
+                return set_xctrl(info, (int)arg);
         }
         mutex_lock(&info->port.mutex);
         switch (cmd) {
@@ -1132,6 +1148,7 @@ static long get_params32(struct slgt_info *info, struct MGSL_PARAMS32 __user *us
         struct MGSL_PARAMS32 tmp_params;
 
         DBGINFO(("%s get_params32\n", info->device_name));
+        memset(&tmp_params, 0, sizeof(tmp_params));
         tmp_params.mode            = (compat_ulong_t)info->params.mode;
         tmp_params.loopback        = info->params.loopback;
         tmp_params.flags           = info->params.flags;
@@ -1212,12 +1229,16 @@ static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file,
         case MGSL_IOCSGPIO:
         case MGSL_IOCGGPIO:
         case MGSL_IOCWAITGPIO:
+        case MGSL_IOCGXSYNC:
+        case MGSL_IOCGXCTRL:
         case MGSL_IOCSTXIDLE:
         case MGSL_IOCTXENABLE:
         case MGSL_IOCRXENABLE:
         case MGSL_IOCTXABORT:
         case TIOCMIWAIT:
         case MGSL_IOCSIF:
+        case MGSL_IOCSXSYNC:
+        case MGSL_IOCSXCTRL:
                 rc = ioctl(tty, file, cmd, arg);
                 break;
         }
@@ -1617,6 +1638,8 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         if (cmd != SIOCWANDEV)
                 return hdlc_ioctl(dev, ifr, cmd);
 
+        memset(&new_line, 0, sizeof(new_line));
+
         switch(ifr->ifr_settings.type) {
         case IF_GET_IFACE: /* return current sync_serial_settings */
 
@@ -1958,6 +1981,7 @@ static void bh_handler(struct work_struct *work)
                         case MGSL_MODE_RAW:
                         case MGSL_MODE_MONOSYNC:
                         case MGSL_MODE_BISYNC:
+                        case MGSL_MODE_XSYNC:
                                 while(rx_get_buf(info));
                                 break;
                         }
@@ -2357,26 +2381,27 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
 
         DBGISR(("slgt_interrupt irq=%d entry\n", info->irq_level));
 
-        spin_lock(&info->lock);
-
         while((gsr = rd_reg32(info, GSR) & 0xffffff00)) {
                 DBGISR(("%s gsr=%08x\n", info->device_name, gsr));
                 info->irq_occurred = true;
                 for(i=0; i < info->port_count ; i++) {
                         if (info->port_array[i] == NULL)
                                 continue;
+                        spin_lock(&info->port_array[i]->lock);
                         if (gsr & (BIT8 << i))
                                 isr_serial(info->port_array[i]);
                         if (gsr & (BIT16 << (i*2)))
                                 isr_rdma(info->port_array[i]);
                         if (gsr & (BIT17 << (i*2)))
                                 isr_tdma(info->port_array[i]);
+                        spin_unlock(&info->port_array[i]->lock);
                 }
         }
 
         if (info->gpio_present) {
                 unsigned int state;
                 unsigned int changed;
+                spin_lock(&info->lock);
                 while ((changed = rd_reg32(info, IOSR)) != 0) {
                         DBGISR(("%s iosr=%08x\n", info->device_name, changed));
                         /* read latched state of GPIO signals */
@@ -2388,22 +2413,24 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
                                         isr_gpio(info->port_array[i], changed, state);
                         }
                 }
+                spin_unlock(&info->lock);
         }
 
         for(i=0; i < info->port_count ; i++) {
                 struct slgt_info *port = info->port_array[i];
-
-                if (port && (port->port.count || port->netcount) &&
+                if (port == NULL)
+                        continue;
+                spin_lock(&port->lock);
+                if ((port->port.count || port->netcount) &&
                     port->pending_bh && !port->bh_running &&
                     !port->bh_requested) {
                         DBGISR(("%s bh queued\n", port->device_name));
                         schedule_work(&port->task);
                         port->bh_requested = true;
                 }
+                spin_unlock(&port->lock);
         }
 
-        spin_unlock(&info->lock);
-
         DBGISR(("slgt_interrupt irq=%d exit\n", info->irq_level));
         return IRQ_HANDLED;
 }
@@ -2883,6 +2910,69 @@ static int set_interface(struct slgt_info *info, int if_mode)
         return 0;
 }
 
+static int get_xsync(struct slgt_info *info, int __user *xsync)
+{
+        DBGINFO(("%s get_xsync=%x\n", info->device_name, info->xsync));
+        if (put_user(info->xsync, xsync))
+                return -EFAULT;
+        return 0;
+}
+
+/*
+ * set extended sync pattern (1 to 4 bytes) for extended sync mode
+ *
+ * sync pattern is contained in least significant bytes of value
+ * most significant byte of sync pattern is oldest (1st sent/detected)
+ */
+static int set_xsync(struct slgt_info *info, int xsync)
+{
+        unsigned long flags;
+
+        DBGINFO(("%s set_xsync=%x)\n", info->device_name, xsync));
+        spin_lock_irqsave(&info->lock, flags);
+        info->xsync = xsync;
+        wr_reg32(info, XSR, xsync);
+        spin_unlock_irqrestore(&info->lock, flags);
+        return 0;
+}
+
+static int get_xctrl(struct slgt_info *info, int __user *xctrl)
+{
+        DBGINFO(("%s get_xctrl=%x\n", info->device_name, info->xctrl));
+        if (put_user(info->xctrl, xctrl))
+                return -EFAULT;
+        return 0;
+}
+
+/*
+ * set extended control options
+ *
+ * xctrl[31:19] reserved, must be zero
+ * xctrl[18:17] extended sync pattern length in bytes
+ *              00 = 1 byte  in xsr[7:0]
+ *              01 = 2 bytes in xsr[15:0]
+ *              10 = 3 bytes in xsr[23:0]
+ *              11 = 4 bytes in xsr[31:0]
+ * xctrl[16]    1 = enable terminal count, 0=disabled
+ * xctrl[15:0]  receive terminal count for fixed length packets
+ *              value is count minus one (0 = 1 byte packet)
+ *              when terminal count is reached, receiver
+ *              automatically returns to hunt mode and receive
+ *              FIFO contents are flushed to DMA buffers with
+ *              end of frame (EOF) status
+ */
+static int set_xctrl(struct slgt_info *info, int xctrl)
+{
+        unsigned long flags;
+
+        DBGINFO(("%s set_xctrl=%x)\n", info->device_name, xctrl));
+        spin_lock_irqsave(&info->lock, flags);
+        info->xctrl = xctrl;
+        wr_reg32(info, XCR, xctrl);
+        spin_unlock_irqrestore(&info->lock, flags);
+        return 0;
+}
+
 /*
  * set general purpose IO pin state and direction
  *
@@ -2906,7 +2996,7 @@ static int set_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
                  info->device_name, gpio.state, gpio.smask,
                  gpio.dir, gpio.dmask));
 
-        spin_lock_irqsave(&info->lock,flags);
+        spin_lock_irqsave(&info->port_array[0]->lock, flags);
         if (gpio.dmask) {
                 data = rd_reg32(info, IODR);
                 data |= gpio.dmask & gpio.dir;
@@ -2919,7 +3009,7 @@ static int set_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
                 data &= ~(gpio.smask & ~gpio.state);
                 wr_reg32(info, IOVR, data);
         }
-        spin_unlock_irqrestore(&info->lock,flags);
+        spin_unlock_irqrestore(&info->port_array[0]->lock, flags);
 
         return 0;
 }
@@ -3020,7 +3110,7 @@ static int wait_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
                 return -EINVAL;
         init_cond_wait(&wait, gpio.smask);
 
-        spin_lock_irqsave(&info->lock, flags);
+        spin_lock_irqsave(&info->port_array[0]->lock, flags);
         /* enable interrupts for watched pins */
         wr_reg32(info, IOER, rd_reg32(info, IOER) | gpio.smask);
         /* get current pin states */
@@ -3032,20 +3122,20 @@ static int wait_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
         } else {
                 /* wait for target state */
                 add_cond_wait(&info->gpio_wait_q, &wait);
-                spin_unlock_irqrestore(&info->lock, flags);
+                spin_unlock_irqrestore(&info->port_array[0]->lock, flags);
                 schedule();
                 if (signal_pending(current))
                         rc = -ERESTARTSYS;
                 else
                         gpio.state = wait.data;
-                spin_lock_irqsave(&info->lock, flags);
+                spin_lock_irqsave(&info->port_array[0]->lock, flags);
                 remove_cond_wait(&info->gpio_wait_q, &wait);
         }
 
         /* disable all GPIO interrupts if no waiting processes */
         if (info->gpio_wait_q == NULL)
                 wr_reg32(info, IOER, 0);
-        spin_unlock_irqrestore(&info->lock,flags);
+        spin_unlock_irqrestore(&info->port_array[0]->lock, flags);
 
         if ((rc == 0) && copy_to_user(user_gpio, &gpio, sizeof(gpio)))
                 rc = -EFAULT;
@@ -3578,7 +3668,6 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
 
                 /* copy resource information from first port to others */
                 for (i = 1; i < port_count; ++i) {
-                        port_array[i]->lock      = port_array[0]->lock;
                         port_array[i]->irq_level = port_array[0]->irq_level;
                         port_array[i]->reg_addr  = port_array[0]->reg_addr;
                         alloc_dma_bufs(port_array[i]);
@@ -3763,7 +3852,9 @@ module_exit(slgt_exit);
 #define CALC_REGADDR() \
         unsigned long reg_addr = ((unsigned long)info->reg_addr) + addr; \
         if (addr >= 0x80) \
-                reg_addr += (info->port_num) * 32;
+                reg_addr += (info->port_num) * 32; \
+        else if (addr >= 0x40)  \
+                reg_addr += (info->port_num) * 16;
 
 static __u8 rd_reg8(struct slgt_info *info, unsigned int addr)
 {
@@ -4182,7 +4273,13 @@ static void sync_mode(struct slgt_info *info)
 
         /* TCR (tx control)
          *
-         * 15..13  mode, 000=HDLC 001=raw 010=async 011=monosync 100=bisync
+         * 15..13  mode
+         *         000=HDLC/SDLC
+         *         001=raw bit synchronous
+         *         010=asynchronous/isochronous
+         *         011=monosync byte synchronous
+         *         100=bisync byte synchronous
+         *         101=xsync byte synchronous
          * 12..10  encoding
          * 09      CRC enable
          * 08      CRC32
@@ -4197,6 +4294,9 @@ static void sync_mode(struct slgt_info *info)
         val = BIT2;
 
         switch(info->params.mode) {
+        case MGSL_MODE_XSYNC:
+                val |= BIT15 + BIT13;
+                break;
         case MGSL_MODE_MONOSYNC: val |= BIT14 + BIT13; break;
         case MGSL_MODE_BISYNC:   val |= BIT15; break;
         case MGSL_MODE_RAW:      val |= BIT13; break;
@@ -4251,7 +4351,13 @@ static void sync_mode(struct slgt_info *info)
 
         /* RCR (rx control)
          *
-         * 15..13  mode, 000=HDLC 001=raw 010=async 011=monosync 100=bisync
+         * 15..13  mode
+         *         000=HDLC/SDLC
+         *         001=raw bit synchronous
+         *         010=asynchronous/isochronous
+         *         011=monosync byte synchronous
+         *         100=bisync byte synchronous
+         *         101=xsync byte synchronous
          * 12..10  encoding
          * 09      CRC enable
          * 08      CRC32
@@ -4263,6 +4369,9 @@ static void sync_mode(struct slgt_info *info)
         val = 0;
 
         switch(info->params.mode) {
+        case MGSL_MODE_XSYNC:
+                val |= BIT15 + BIT13;
+                break;
         case MGSL_MODE_MONOSYNC: val |= BIT14 + BIT13; break;
         case MGSL_MODE_BISYNC:   val |= BIT15; break;
         case MGSL_MODE_RAW:      val |= BIT13; break;
@@ -4679,6 +4788,7 @@ static bool rx_get_buf(struct slgt_info *info)
         switch(info->params.mode) {
         case MGSL_MODE_MONOSYNC:
         case MGSL_MODE_BISYNC:
+        case MGSL_MODE_XSYNC:
                 /* ignore residue in byte synchronous modes */
                 if (desc_residue(info->rbufs[i]))
                         count--;
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 38df8c19e74c..6b68a0fb4611 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -503,6 +503,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
         struct kbd_struct * kbd;
         unsigned int console;
         unsigned char ucval;
+        unsigned int uival;
         void __user *up = (void __user *)arg;
         int i, perm;
         int ret = 0;
@@ -657,7 +658,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 break;
 
         case KDGETMODE:
-                ucval = vc->vc_mode;
+                uival = vc->vc_mode;
                 goto setint;
 
         case KDMAPDISP:
@@ -695,7 +696,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 break;
 
         case KDGKBMODE:
-                ucval = ((kbd->kbdmode == VC_RAW) ? K_RAW :
+                uival = ((kbd->kbdmode == VC_RAW) ? K_RAW :
                                  (kbd->kbdmode == VC_MEDIUMRAW) ? K_MEDIUMRAW :
                                  (kbd->kbdmode == VC_UNICODE) ? K_UNICODE :
                                  K_XLATE);
@@ -717,9 +718,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 break;
 
         case KDGKBMETA:
-                ucval = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
+                uival = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
         setint:
-                ret = put_user(ucval, (int __user *)arg);
+                ret = put_user(uival, (int __user *)arg);
                 break;
 
         case KDGETKEYCODE:
@@ -949,7 +950,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 for (i = 0; i < MAX_NR_CONSOLES; ++i)
                         if (! VT_IS_IN_USE(i))
                                 break;
-                ucval = i < MAX_NR_CONSOLES ? (i+1) : -1;
+                uival = i < MAX_NR_CONSOLES ? (i+1) : -1;
                 goto setint;             
 
         /*