Merge branch 'master' into for-next

11 files changed, 43 insertions, 29 deletions

diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 1b6ad6247204..28dd77144e8f 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -24,8 +24,6 @@
 #include <linux/mtd/mtdram.h>
 #include <linux/mtd/partitions.h>
 
-#include <linux/cramfs_fs.h>
-
 #include <asm/axisflashmap.h>
 #include <asm/mmu.h>
 
diff --git a/arch/cris/arch-v32/drivers/mach-a3/gpio.c b/arch/cris/arch-v32/drivers/mach-a3/gpio.c
index 0b86deedacb9..74f9fe80940c 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/gpio.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/gpio.c
@@ -978,7 +978,7 @@ static int __init gpio_init(void)
         CRIS_LED_DISK_WRITE(0);
 
         int res2 = request_irq(GIO_INTR_VECT, gpio_interrupt,
-                IRQF_SHARED | IRQF_DISABLED, "gpio", &alarmlist);
+                IRQF_SHARED, "gpio", &alarmlist);
         if (res2) {
                 printk(KERN_ERR "err: irq for gpio\n");
                 return res2;
diff --git a/arch/cris/arch-v32/drivers/mach-fs/gpio.c b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
index a2ac0917f1a6..9e54273af0ca 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/gpio.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
@@ -964,11 +964,11 @@ gpio_init(void)
          * in some tests.
          */
         if (request_irq(TIMER0_INTR_VECT, gpio_poll_timer_interrupt,
-                        IRQF_SHARED | IRQF_DISABLED, "gpio poll", &alarmlist))
+                        IRQF_SHARED, "gpio poll", &alarmlist))
                 printk(KERN_ERR "timer0 irq for gpio\n");
 
         if (request_irq(GIO_INTR_VECT, gpio_pa_interrupt,
-                        IRQF_SHARED | IRQF_DISABLED, "gpio PA", &alarmlist))
+                        IRQF_SHARED, "gpio PA", &alarmlist))
                 printk(KERN_ERR "PA irq for gpio\n");
 
 #ifdef CONFIG_ETRAX_VIRTUAL_GPIO
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index 219f704e3221..bbb806b68838 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/timer.h>
 #include <linux/spinlock.h>
+#include <linux/wait.h>
 
 #include <asm/io.h>
 #include <dma.h>
@@ -1144,7 +1145,8 @@ static ssize_t sync_serial_read(struct file * file, char * buf,
                 if (file->f_flags & O_NONBLOCK)
                         return -EAGAIN;
 
-                interruptible_sleep_on(&port->in_wait_q);
+                wait_event_interruptible(port->in_wait_q,
+                                         !(start == end && !port->full));
                 if (signal_pending(current))
                         return -EINTR;
 
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
index faa644111feb..2f19ac6217aa 100644
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -424,7 +424,7 @@ nmi_interrupt:
         bpl     1f
         nop
         jsr     handle_watchdog_bite    ; In time.c.
-        move.d  $sp, $r10               ; Pointer to registers
+        move.d  $sp, $r10               ; Pointer to registers
 1:      btstq   REG_BIT(intr_vect, r_nmi, ext), $r0
         bpl     1f
         nop
@@ -452,7 +452,7 @@ spurious_interrupt:
         nop
 
         ;; This handles the case when multiple interrupts arrive at the same
-        ;; time. Jump to the first set interrupt bit in a priotiry fashion. The
+        ;; time. Jump to the first set interrupt bit in a priority fashion. The
         ;; hardware will call the unserved interrupts after the handler
         ;; finishes.
         .type   multiple_interrupt, @function
@@ -885,13 +885,29 @@ sys_call_table:
         .long sys_preadv
         .long sys_pwritev
         .long sys_setns                 /* 335 */
-
-        /*
-         * NOTE!! This doesn't have to be exact - we just have
-         * to make sure we have _enough_ of the "sys_ni_syscall"
-         * entries. Don't panic if you notice that this hasn't
-         * been shrunk every time we add a new system call.
-         */
+        .long sys_name_to_handle_at
+        .long sys_open_by_handle_at
+        .long sys_rt_tgsigqueueinfo
+        .long sys_perf_event_open
+        .long sys_recvmmsg              /* 340 */
+        .long sys_accept4
+        .long sys_fanotify_init
+        .long sys_fanotify_mark
+        .long sys_prlimit64
+        .long sys_clock_adjtime         /* 345 */
+        .long sys_syncfs
+        .long sys_sendmmsg
+        .long sys_process_vm_readv
+        .long sys_process_vm_writev
+        .long sys_kcmp                  /* 350 */
+        .long sys_finit_module
+
+        /*
+         * NOTE!! This doesn't have to be exact - we just have
+         * to make sure we have _enough_ of the "sys_ni_syscall"
+         * entries. Don't panic if you notice that this hasn't
+         * been shrunk every time we add a new system call.
+         */
 
         .rept NR_syscalls - (.-sys_call_table) / 4
                 .long sys_ni_syscall
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c
index f6644535b17e..b130c2c5fdd8 100644
--- a/arch/cris/arch-v32/kernel/fasttimer.c
+++ b/arch/cris/arch-v32/kernel/fasttimer.c
@@ -786,7 +786,7 @@ int fast_timer_init(void)
     proc_create("fasttimer", 0, NULL, &proc_fasttimer_fops);
 #endif /* PROC_FS */
                 if (request_irq(TIMER0_INTR_VECT, timer_trig_interrupt,
-                                IRQF_SHARED | IRQF_DISABLED,
+                                IRQF_SHARED,
                                 "fast timer int", &fast_timer_list))
                         printk(KERN_ERR "err: fasttimer irq\n");
     fast_timer_is_init = 1;
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 5ebe6e841820..25437ae28128 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -331,11 +331,11 @@ extern void do_IRQ(int irq, struct pt_regs * regs);
 void
 crisv32_do_IRQ(int irq, int block, struct pt_regs* regs)
 {
-        /* Interrupts that may not be moved to another CPU and
-         * are IRQF_DISABLED may skip blocking. This is currently
-         * only valid for the timer IRQ and the IPI and is used
-         * for the timer interrupt to avoid watchdog starvation.
-         */
+        /* Interrupts that may not be moved to another CPU may
+         * skip blocking. This is currently only valid for the
+         * timer IRQ and the IPI and is used for the timer
+         * interrupt to avoid watchdog starvation.
+         */
         if (!block) {
                 do_IRQ(irq, regs);
                 return;
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index fe8e6039db2a..0698582467ca 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -64,7 +64,7 @@ static irqreturn_t crisv32_ipi_interrupt(int irq, void *dev_id);
 static int send_ipi(int vector, int wait, cpumask_t cpu_mask);
 static struct irqaction irq_ipi  = {
         .handler = crisv32_ipi_interrupt,
-        .flags = IRQF_DISABLED,
+        .flags = 0,
         .name = "ipi",
 };
 
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
index 8c4b45efd7b6..ee66866538f8 100644
--- a/arch/cris/arch-v32/kernel/time.c
+++ b/arch/cris/arch-v32/kernel/time.c
@@ -216,12 +216,10 @@ static inline irqreturn_t timer_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-/* Timer is IRQF_SHARED so drivers can add stuff to the timer irq chain.
- * It needs to be IRQF_DISABLED to make the jiffies update work properly.
- */
+/* Timer is IRQF_SHARED so drivers can add stuff to the timer irq chain. */
 static struct irqaction irq_timer = {
         .handler = timer_interrupt,
-        .flags = IRQF_SHARED | IRQF_DISABLED,
+        .flags = IRQF_SHARED,
         .name = "timer"
 };
 
diff --git a/arch/cris/arch-v32/mach-a3/arbiter.c b/arch/cris/arch-v32/mach-a3/arbiter.c
index 15f5c9de2639..ab5c421a4de8 100644
--- a/arch/cris/arch-v32/mach-a3/arbiter.c
+++ b/arch/cris/arch-v32/mach-a3/arbiter.c
@@ -256,11 +256,11 @@ static void crisv32_arbiter_init(void)
         crisv32_arbiter_config(1, EXT_REGION, 0);
 
         if (request_irq(MEMARB_FOO_INTR_VECT, crisv32_foo_arbiter_irq,
-                        IRQF_DISABLED, "arbiter", NULL))
+                        0, "arbiter", NULL))
                 printk(KERN_ERR "Couldn't allocate arbiter IRQ\n");
 
         if (request_irq(MEMARB_BAR_INTR_VECT, crisv32_bar_arbiter_irq,
-                        IRQF_DISABLED, "arbiter", NULL))
+                        0, "arbiter", NULL))
                 printk(KERN_ERR "Couldn't allocate arbiter IRQ\n");
 
 #ifndef CONFIG_ETRAX_KGDB
diff --git a/arch/cris/arch-v32/mach-fs/arbiter.c b/arch/cris/arch-v32/mach-fs/arbiter.c
index 3f8ebb5c1477..c97f4d8120f9 100644
--- a/arch/cris/arch-v32/mach-fs/arbiter.c
+++ b/arch/cris/arch-v32/mach-fs/arbiter.c
@@ -184,7 +184,7 @@ static void crisv32_arbiter_init(void)
         crisv32_arbiter_config(EXT_REGION, 0);
         crisv32_arbiter_config(INT_REGION, 0);
 
-        if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, IRQF_DISABLED,
+        if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, 0,
                         "arbiter", NULL))
                 printk(KERN_ERR "Couldn't allocate arbiter IRQ\n");