diff options
Diffstat (limited to 'arch/um/drivers/line.c')
-rw-r--r-- | arch/um/drivers/line.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 5ca57ca33713..ebebaabb78ad 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
@@ -373,7 +373,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data, | |||
373 | int err; | 373 | int err; |
374 | 374 | ||
375 | /* Interrupts are enabled here because we registered the interrupt with | 375 | /* Interrupts are enabled here because we registered the interrupt with |
376 | * SA_INTERRUPT (see line_setup_irq).*/ | 376 | * IRQF_DISABLED (see line_setup_irq).*/ |
377 | 377 | ||
378 | spin_lock_irq(&line->lock); | 378 | spin_lock_irq(&line->lock); |
379 | err = flush_buffer(line); | 379 | err = flush_buffer(line); |
@@ -406,7 +406,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data, | |||
406 | int line_setup_irq(int fd, int input, int output, struct line *line, void *data) | 406 | int line_setup_irq(int fd, int input, int output, struct line *line, void *data) |
407 | { | 407 | { |
408 | struct line_driver *driver = line->driver; | 408 | struct line_driver *driver = line->driver; |
409 | int err = 0, flags = SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM; | 409 | int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM; |
410 | 410 | ||
411 | if (input) | 411 | if (input) |
412 | err = um_request_irq(driver->read_irq, fd, IRQ_READ, | 412 | err = um_request_irq(driver->read_irq, fd, IRQ_READ, |
@@ -767,7 +767,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty) | |||
767 | spin_unlock(&winch_handler_lock); | 767 | spin_unlock(&winch_handler_lock); |
768 | 768 | ||
769 | if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt, | 769 | if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt, |
770 | SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, | 770 | IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM, |
771 | "winch", winch) < 0) | 771 | "winch", winch) < 0) |
772 | printk("register_winch_irq - failed to register IRQ\n"); | 772 | printk("register_winch_irq - failed to register IRQ\n"); |
773 | } | 773 | } |