9 files changed, 12 insertions, 12 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,
         int err;
 
         /* Interrupts are enabled here because we registered the interrupt with
-         * SA_INTERRUPT (see line_setup_irq).*/
+         * IRQF_DISABLED (see line_setup_irq).*/
 
         spin_lock_irq(&line->lock);
         err = flush_buffer(line);
@@ -406,7 +406,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data,
 int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
 {
         struct line_driver *driver = line->driver;
-        int err = 0, flags = SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM;
+        int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM;
 
         if (input)
                 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)
         spin_unlock(&winch_handler_lock);
 
         if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
-                          SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
+                          IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                           "winch", winch) < 0)
                 printk("register_winch_irq - failed to register IRQ\n");
 }
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 79149314ed04..b414522f7686 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -777,7 +777,7 @@ static int mconsole_init(void)
         register_reboot_notifier(&reboot_notifier);
 
         err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,
-                             SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
+                             IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                              "mconsole", (void *)sock);
         if (err){
                 printk("Failed to get IRQ for management console\n");
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 8c7279bb353b..501f95675d89 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -128,7 +128,7 @@ static int uml_net_open(struct net_device *dev)
         }
 
         err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
-                             SA_INTERRUPT | SA_SHIRQ, dev->name, dev);
+                             IRQF_DISABLED | IRQF_SHARED, dev->name, dev);
         if(err != 0){
                 printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
                 err = -ENETUNREACH;
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index 189839e4f1d4..73755f37a8a8 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -105,7 +105,7 @@ static int port_accept(struct port_list *port)
                   .port         = port });
 
         if(um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt, 
-                          SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, 
+                          IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                           "telnetd", conn)){
                 printk(KERN_ERR "port_accept : failed to get IRQ for "
                        "telnetd\n");
@@ -186,7 +186,7 @@ void *port_data(int port_num)
                 goto out_free;
         }
         if(um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt, 
-                          SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, "port",
+                          IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM, "port",
                           port)){
                 printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);
                 goto out_close;
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 0345e2551247..602d7286b9e0 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -874,7 +874,7 @@ int ubd_driver_init(void){
                 return(0);
         }
         err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr,
-                             SA_INTERRUPT, "ubd", ubd_dev);
+                             IRQF_DISABLED, "ubd", ubd_dev);
         if(err != 0)
                 printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);
         return 0;
diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index d269a80f4b0c..6036ec85895a 100644
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -54,7 +54,7 @@ int xterm_fd(int socket, int *pid_out)
         init_completion(&data->ready);
 
         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, "
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 *,
         }
 
         err = um_request_irq(irq, fds[0], IRQ_READ, handler,
-                             SA_INTERRUPT | SA_SAMPLE_RANDOM, name,
+                             IRQF_DISABLED | IRQF_SAMPLE_RANDOM, name,
                              (void *) (long) fds[0]);
         if (err) {
                 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)
         int err;
 
         err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt,
-                             SA_INTERRUPT | SA_SAMPLE_RANDOM, "write sigio",
+                             IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "write sigio",
                              NULL);
         if(err){
                 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)
         int err;
 
         user_time_init();
-        err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", NULL);
+        err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL);
         if(err != 0)
                 printk(KERN_ERR "timer_init : request_irq failed - "
                        "errno = %d\n", -err);