diff options
Diffstat (limited to 'arch/um/kernel')
-rw-r--r-- | arch/um/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/sigio_kern.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/time_kern.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index fae43a3054a0..bfd0bdc8cd40 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
@@ -474,7 +474,7 @@ int init_aio_irq(int irq, char *name, irqreturn_t (*handler)(int, void *, | |||
474 | } | 474 | } |
475 | 475 | ||
476 | err = um_request_irq(irq, fds[0], IRQ_READ, handler, | 476 | err = um_request_irq(irq, fds[0], IRQ_READ, handler, |
477 | SA_INTERRUPT | SA_SAMPLE_RANDOM, name, | 477 | IRQF_DISABLED | IRQF_SAMPLE_RANDOM, name, |
478 | (void *) (long) fds[0]); | 478 | (void *) (long) fds[0]); |
479 | if (err) { | 479 | if (err) { |
480 | printk("init_aio_irq - : um_request_irq failed, err = %d\n", | 480 | printk("init_aio_irq - : um_request_irq failed, err = %d\n", |
diff --git a/arch/um/kernel/sigio_kern.c b/arch/um/kernel/sigio_kern.c index 1c1300fb1e95..51b677083948 100644 --- a/arch/um/kernel/sigio_kern.c +++ b/arch/um/kernel/sigio_kern.c | |||
@@ -31,7 +31,7 @@ int write_sigio_irq(int fd) | |||
31 | int err; | 31 | int err; |
32 | 32 | ||
33 | err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt, | 33 | err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt, |
34 | SA_INTERRUPT | SA_SAMPLE_RANDOM, "write sigio", | 34 | IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "write sigio", |
35 | NULL); | 35 | NULL); |
36 | if(err){ | 36 | if(err){ |
37 | printk("write_sigio_irq : um_request_irq failed, err = %d\n", | 37 | printk("write_sigio_irq : um_request_irq failed, err = %d\n", |
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c index 820fa3615a3f..d7e044b5e5ee 100644 --- a/arch/um/kernel/time_kern.c +++ b/arch/um/kernel/time_kern.c | |||
@@ -195,7 +195,7 @@ int __init timer_init(void) | |||
195 | int err; | 195 | int err; |
196 | 196 | ||
197 | user_time_init(); | 197 | user_time_init(); |
198 | err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", NULL); | 198 | err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL); |
199 | if(err != 0) | 199 | if(err != 0) |
200 | printk(KERN_ERR "timer_init : request_irq failed - " | 200 | printk(KERN_ERR "timer_init : request_irq failed - " |
201 | "errno = %d\n", -err); | 201 | "errno = %d\n", -err); |