diff options
Diffstat (limited to 'arch/um/kernel/sigio.c')
| -rw-r--r-- | arch/um/kernel/sigio.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c index 89f9866a1354..2b272b63b514 100644 --- a/arch/um/kernel/sigio.c +++ b/arch/um/kernel/sigio.c | |||
| @@ -1,18 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com) | 2 | * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com) |
| 3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include "linux/kernel.h" | 6 | #include <linux/interrupt.h> |
| 7 | #include "linux/list.h" | ||
| 8 | #include "linux/slab.h" | ||
| 9 | #include "linux/signal.h" | ||
| 10 | #include "linux/interrupt.h" | ||
| 11 | #include "init.h" | ||
| 12 | #include "sigio.h" | ||
| 13 | #include "irq_user.h" | ||
| 14 | #include "irq_kern.h" | 7 | #include "irq_kern.h" |
| 15 | #include "os.h" | 8 | #include "os.h" |
| 9 | #include "sigio.h" | ||
| 16 | 10 | ||
| 17 | /* Protected by sigio_lock() called from write_sigio_workaround */ | 11 | /* Protected by sigio_lock() called from write_sigio_workaround */ |
| 18 | static int sigio_irq_fd = -1; | 12 | static int sigio_irq_fd = -1; |
| @@ -33,9 +27,9 @@ int write_sigio_irq(int fd) | |||
| 33 | err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt, | 27 | err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt, |
| 34 | IRQF_DISABLED|IRQF_SAMPLE_RANDOM, "write sigio", | 28 | IRQF_DISABLED|IRQF_SAMPLE_RANDOM, "write sigio", |
| 35 | NULL); | 29 | NULL); |
| 36 | if(err){ | 30 | if (err) { |
| 37 | printk("write_sigio_irq : um_request_irq failed, err = %d\n", | 31 | printk(KERN_ERR "write_sigio_irq : um_request_irq failed, " |
| 38 | err); | 32 | "err = %d\n", err); |
| 39 | return -1; | 33 | return -1; |
| 40 | } | 34 | } |
| 41 | sigio_irq_fd = fd; | 35 | sigio_irq_fd = fd; |