8 files changed, 39 insertions, 26 deletions

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 7b8baf146acc..9fdfad649536 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -236,11 +236,11 @@ void free_irqs(void)
         struct chan *chan;
         LIST_HEAD(list);
         struct list_head *ele;
+        unsigned long flags;
 
-        spin_lock_irq(&irqs_to_free_lock);
+        spin_lock_irqsave(&irqs_to_free_lock, flags);
         list_splice_init(&irqs_to_free, &list);
-        INIT_LIST_HEAD(&irqs_to_free);
-        spin_unlock_irq(&irqs_to_free_lock);
+        spin_unlock_irqrestore(&irqs_to_free_lock, flags);
 
         list_for_each(ele, &list){
                 chan = list_entry(ele, struct chan, free_list);
@@ -255,13 +255,15 @@ void free_irqs(void)
 
 static void close_one_chan(struct chan *chan, int delay_free_irq)
 {
+        unsigned long flags;
+
         if(!chan->opened)
                 return;
 
         if(delay_free_irq){
-                spin_lock_irq(&irqs_to_free_lock);
+                spin_lock_irqsave(&irqs_to_free_lock, flags);
                 list_add(&chan->free_list, &irqs_to_free);
-                spin_unlock_irq(&irqs_to_free_lock);
+                spin_unlock_irqrestore(&irqs_to_free_lock, flags);
         }
         else {
                 if(chan->input)
diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
index 310af0f1e49e..021b82c7a759 100644
--- a/arch/um/drivers/daemon_user.c
+++ b/arch/um/drivers/daemon_user.c
@@ -56,30 +56,31 @@ static int connect_to_switch(struct daemon_data *pri)
 
         pri->control = socket(AF_UNIX, SOCK_STREAM, 0);
         if(pri->control < 0){
+                err = -errno;
                 printk("daemon_open : control socket failed, errno = %d\n", 
-                       errno);          
-                return(-errno);
+                       -err);
+                return err;
         }
 
         if(connect(pri->control, (struct sockaddr *) ctl_addr, 
                    sizeof(*ctl_addr)) < 0){
-                printk("daemon_open : control connect failed, errno = %d\n",
-                       errno);
                 err = -errno;
+                printk("daemon_open : control connect failed, errno = %d\n",
+                       -err);
                 goto out;
         }
 
         fd = socket(AF_UNIX, SOCK_DGRAM, 0);
         if(fd < 0){
-                printk("daemon_open : data socket failed, errno = %d\n", 
-                       errno);
                 err = -errno;
+                printk("daemon_open : data socket failed, errno = %d\n",
+                       -err);
                 goto out;
         }
         if(bind(fd, (struct sockaddr *) local_addr, sizeof(*local_addr)) < 0){
-                printk("daemon_open : data bind failed, errno = %d\n", 
-                       errno);
                 err = -errno;
+                printk("daemon_open : data bind failed, errno = %d\n",
+                       -err);
                 goto out_close;
         }
 
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 01d4ab6b0ef1..f75d7b05c481 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -370,10 +370,10 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
         struct tty_struct *tty = line->tty;
         int err;
 
-        /* Interrupts are enabled here because we registered the interrupt with
+        /* Interrupts are disabled here because we registered the interrupt with
          * IRQF_DISABLED (see line_setup_irq).*/
 
-        spin_lock_irq(&line->lock);
+        spin_lock(&line->lock);
         err = flush_buffer(line);
         if (err == 0) {
                 return IRQ_NONE;
@@ -381,7 +381,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
                 line->head = line->buffer;
                 line->tail = line->buffer;
         }
-        spin_unlock_irq(&line->lock);
+        spin_unlock(&line->lock);
 
         if(tty == NULL)
                 return IRQ_NONE;
diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
index 8138f5ea1bf7..b827e82884c9 100644
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
@@ -50,6 +50,14 @@ static void mcast_user_init(void *data, void *dev)
         pri->dev = dev;
 }
 
+static void mcast_remove(void *data)
+{
+        struct mcast_data *pri = data;
+
+        kfree(pri->mcast_addr);
+        pri->mcast_addr = NULL;
+}
+
 static int mcast_open(void *data)
 {
         struct mcast_data *pri = data;
@@ -157,7 +165,7 @@ const struct net_user_info mcast_user_info = {
         .init           = mcast_user_init,
         .open           = mcast_open,
         .close          = mcast_close,
-        .remove         = NULL,
+        .remove         = mcast_remove,
         .set_mtu        = mcast_set_mtu,
         .add_address    = NULL,
         .delete_address = NULL,
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 178b2eff4a8c..65ad2932672c 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -615,6 +615,9 @@ void mconsole_remove(struct mc_request *req)
         err_msg = NULL;
         err = (*dev->remove)(n, &err_msg);
         switch(err){
+        case 0:
+                err_msg = "";
+                break;
         case -ENODEV:
                 if(err_msg == NULL)
                         err_msg = "Device doesn't exist";
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index fc22b9bd9153..4b382a6e710f 100644
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
@@ -179,7 +179,7 @@ static struct console ssl_cons = {
         .write          = ssl_console_write,
         .device         = ssl_console_device,
         .setup          = ssl_console_setup,
-        .flags          = CON_PRINTBUFFER,
+        .flags          = CON_PRINTBUFFER|CON_ANYTIME,
         .index          = -1,
 };
 
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 7ff0b0fc37e7..76d1f1c980ef 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -153,7 +153,7 @@ static struct console stdiocons = {
         .write          = uml_console_write,
         .device         = uml_console_device,
         .setup          = uml_console_setup,
-        .flags          = CON_PRINTBUFFER,
+        .flags          = CON_PRINTBUFFER|CON_ANYTIME,
         .index          = -1,
 };
 
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index f98d26e51381..8bd9204ac1ab 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -109,10 +109,6 @@ static inline void ubd_set_bit(__u64 bit, unsigned char *data)
 
 static DEFINE_MUTEX(ubd_lock);
 
-/* XXX - this made sense in 2.4 days, now it's only used as a boolean, and
- * probably it doesn't make sense even for that. */
-static int do_ubd;
-
 static int ubd_open(struct inode * inode, struct file * filp);
 static int ubd_release(struct inode * inode, struct file * file);
 static int ubd_ioctl(struct inode * inode, struct file * file,
@@ -169,6 +165,7 @@ struct ubd {
         struct platform_device pdev;
         struct request_queue *queue;
         spinlock_t lock;
+        int active;
 };
 
 #define DEFAULT_COW { \
@@ -190,6 +187,7 @@ struct ubd {
         .shared =               0, \
         .cow =                  DEFAULT_COW, \
         .lock =                 SPIN_LOCK_UNLOCKED,     \
+        .active =               0, \
 }
 
 /* Protected by ubd_lock */
@@ -507,7 +505,6 @@ static void ubd_handler(void)
         struct ubd *dev;
         int n;
 
-        do_ubd = 0;
         n = os_read_file(thread_fd, &req, sizeof(req));
         if(n != sizeof(req)){
                 printk(KERN_ERR "Pid %d - spurious interrupt in ubd_handler, "
@@ -517,6 +514,7 @@ static void ubd_handler(void)
 
         rq = req.req;
         dev = rq->rq_disk->private_data;
+        dev->active = 0;
 
         ubd_finish(rq, req.error);
         reactivate_fd(thread_fd, UBD_IRQ);
@@ -1081,11 +1079,12 @@ static void do_ubd_request(request_queue_t *q)
                 }
         }
         else {
-                if(do_ubd || (req = elv_next_request(q)) == NULL)
+                struct ubd *dev = q->queuedata;
+                if(dev->active || (req = elv_next_request(q)) == NULL)
                         return;
                 err = prepare_request(req, &io_req);
                 if(!err){
-                        do_ubd = 1;
+                        dev->active = 1;
                         n = os_write_file(thread_fd, (char *) &io_req,
                                          sizeof(io_req));
                         if(n != sizeof(io_req))