vserver 1.9.5.x5

[linux-2.6.git] / arch / um / drivers / xterm_kern.c

diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index 1b4683f..afce46f 100644 (file)
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -5,9 +5,12 @@
 
 #include "linux/errno.h"
 #include "linux/slab.h"
+#include "linux/signal.h"
+#include "linux/interrupt.h"
 #include "asm/semaphore.h"
 #include "asm/irq.h"
 #include "irq_user.h"
+#include "irq_kern.h"
 #include "kern_util.h"
 #include "os.h"
 #include "xterm.h"
@@ -19,17 +22,18 @@ struct xterm_wait {
        int new_fd;
 };
 
-static void xterm_interrupt(int irq, void *data, struct pt_regs *regs)
+static irqreturn_t xterm_interrupt(int irq, void *data, struct pt_regs *regs)
 {
        struct xterm_wait *xterm = data;
        int fd;
 
        fd = os_rcv_fd(xterm->fd, &xterm->pid);
        if(fd == -EAGAIN)
-               return;
+               return(IRQ_NONE);
 
        xterm->new_fd = fd;
        up(&xterm->sem);
+       return(IRQ_HANDLED);
 }
 
 int xterm_fd(int socket, int *pid_out)
@@ -42,6 +46,8 @@ int xterm_fd(int socket, int *pid_out)
                printk(KERN_ERR "xterm_fd : failed to allocate xterm_wait\n");
                return(-ENOMEM);
        }
+
+       /* This is a locked semaphore... */
        *data = ((struct xterm_wait) 
                { .sem          = __SEMAPHORE_INITIALIZER(data->sem, 0),
                  .fd           = socket,
@@ -51,17 +57,25 @@ int xterm_fd(int socket, int *pid_out)
        err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt, 
                             SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, 
                             "xterm", data);
-       if(err){
+       if (err){
                printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
                       "err = %d\n",  err);
-               return(err);
+               ret = err;
+               goto out;
        }
+
+       /* ... so here we wait for an xterm interrupt.
+        *
+        * XXX Note, if the xterm doesn't work for some reason (eg. DISPLAY
+        * isn't set) this will hang... */
        down(&data->sem);
 
+       free_irq_by_irq_and_dev(XTERM_IRQ, data);
        free_irq(XTERM_IRQ, data);
 
        ret = data->new_fd;
        *pid_out = data->pid;
+ out:
        kfree(data);
 
        return(ret);