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]
/
arch
/
um
/
drivers
/
xterm_kern.c
diff --git
a/arch/um/drivers/xterm_kern.c
b/arch/um/drivers/xterm_kern.c
index
afce46f
..
a4ce705
100644
(file)
--- a/
arch/um/drivers/xterm_kern.c
+++ b/
arch/um/drivers/xterm_kern.c
@@
-7,7
+7,6
@@
#include "linux/slab.h"
#include "linux/signal.h"
#include "linux/interrupt.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 "asm/irq.h"
#include "irq_user.h"
#include "irq_kern.h"
@@
-16,13
+15,13
@@
#include "xterm.h"
struct xterm_wait {
#include "xterm.h"
struct xterm_wait {
- struct
semaphore sem
;
+ struct
completion ready
;
int fd;
int pid;
int new_fd;
};
int fd;
int pid;
int new_fd;
};
-static irqreturn_t xterm_interrupt(int irq, void *data
, struct pt_regs *regs
)
+static irqreturn_t xterm_interrupt(int irq, void *data)
{
struct xterm_wait *xterm = data;
int fd;
{
struct xterm_wait *xterm = data;
int fd;
@@
-32,7
+31,7
@@
static irqreturn_t xterm_interrupt(int irq, void *data, struct pt_regs *regs)
return(IRQ_NONE);
xterm->new_fd = fd;
return(IRQ_NONE);
xterm->new_fd = fd;
-
up(&xterm->sem
);
+
complete(&xterm->ready
);
return(IRQ_HANDLED);
}
return(IRQ_HANDLED);
}
@@
-49,13
+48,13
@@
int xterm_fd(int socket, int *pid_out)
/* This is a locked semaphore... */
*data = ((struct xterm_wait)
/* This is a locked semaphore... */
*data = ((struct xterm_wait)
- { .sem = __SEMAPHORE_INITIALIZER(data->sem, 0),
- .fd = socket,
+ { .fd = socket,
.pid = -1,
.new_fd = -1 });
.pid = -1,
.new_fd = -1 });
+ init_completion(&data->ready);
err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
- SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
+ IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
"xterm", data);
if (err){
printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
"xterm", data);
if (err){
printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
@@
-68,9
+67,8
@@
int xterm_fd(int socket, int *pid_out)
*
* XXX Note, if the xterm doesn't work for some reason (eg. DISPLAY
* isn't set) this will hang... */
*
* XXX Note, if the xterm doesn't work for some reason (eg. DISPLAY
* isn't set) this will hang... */
-
down(&data->sem
);
+
wait_for_completion(&data->ready
);
- free_irq_by_irq_and_dev(XTERM_IRQ, data);
free_irq(XTERM_IRQ, data);
ret = data->new_fd;
free_irq(XTERM_IRQ, data);
ret = data->new_fd;