projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
[linux-2.6-microblaze.git]
/
arch
/
um
/
drivers
/
xterm_kern.c
diff --git
a/arch/um/drivers/xterm_kern.c
b/arch/um/drivers/xterm_kern.c
index
8bd130f
..
b68bbe2
100644
(file)
--- a/
arch/um/drivers/xterm_kern.c
+++ b/
arch/um/drivers/xterm_kern.c
@@
-65,7
+65,7
@@
int xterm_fd(int socket, int *pid_out)
* isn't set) this will hang... */
wait_for_completion(&data->ready);
- free_irq(XTERM_IRQ, data);
+
um_
free_irq(XTERM_IRQ, data);
ret = data->new_fd;
*pid_out = data->pid;