6 files changed, 34 insertions, 18 deletions

diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c
index 9fb58202be99..67c61ea86813 100644
--- a/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/arch/cris/arch-v32/drivers/cryptocop.c
@@ -11,6 +11,7 @@
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/stddef.h>
 
@@ -2302,11 +2303,11 @@ static int cryptocop_job_setup(struct cryptocop_prio_job **pj, struct cryptocop_
         return 0;
 }
 
-
 static int cryptocop_open(struct inode *inode, struct file *filp)
 {
         int p = iminor(inode);
 
+        cycle_kernel_lock();
         if (p != CRYPTOCOP_MINOR) return -EINVAL;
 
         filp->private_data = NULL;
diff --git a/arch/cris/arch-v32/drivers/i2c.c b/arch/cris/arch-v32/drivers/i2c.c
index c2fb7a5c1396..179e7b804331 100644
--- a/arch/cris/arch-v32/drivers/i2c.c
+++ b/arch/cris/arch-v32/drivers/i2c.c
@@ -33,6 +33,7 @@
 #include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 
 #include <asm/etraxi2c.h>
 
@@ -636,6 +637,7 @@ i2c_readreg(unsigned char theSlave, unsigned char theReg)
 static int
 i2c_open(struct inode *inode, struct file *filp)
 {
+        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/arch/cris/arch-v32/drivers/mach-a3/gpio.c b/arch/cris/arch-v32/drivers/mach-a3/gpio.c
index de107dad9f4f..ef98608e5067 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/gpio.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/gpio.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 
 #include <asm/etraxgpio.h>
 #include <hwregs/reg_map.h>
@@ -390,6 +391,8 @@ static int gpio_open(struct inode *inode, struct file *filp)
 
         if (!priv)
                 return -ENOMEM;
+
+        lock_kernel();
         memset(priv, 0, sizeof(*priv));
 
         priv->minor = p;
@@ -412,6 +415,7 @@ static int gpio_open(struct inode *inode, struct file *filp)
                 spin_unlock_irq(&gpio_lock);
         }
 
+        unlock_kernel();
         return 0;
 }
 
diff --git a/arch/cris/arch-v32/drivers/mach-fs/gpio.c b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
index 7863fd4efc2b..fe1fde893887 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/gpio.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 
 #include <asm/etraxgpio.h>
 #include <hwregs/reg_map.h>
@@ -426,9 +427,10 @@ gpio_open(struct inode *inode, struct file *filp)
                 return -EINVAL;
 
         priv = kmalloc(sizeof(struct gpio_private), GFP_KERNEL);
-
         if (!priv)
                 return -ENOMEM;
+
+        lock_kernel();
         memset(priv, 0, sizeof(*priv));
 
         priv->minor = p;
@@ -449,6 +451,7 @@ gpio_open(struct inode *inode, struct file *filp)
         alarmlist = priv;
         spin_unlock_irq(&alarm_lock);
 
+        unlock_kernel();
         return 0;
 }
 
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index 47c377df6fb3..d2a0fbf5341f 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -14,6 +14,7 @@
 #include <linux/major.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/init.h>
@@ -429,23 +430,26 @@ static inline int sync_data_avail_to_end(struct sync_port *port)
 static int sync_serial_open(struct inode *inode, struct file *file)
 {
         int dev = iminor(inode);
+        int ret = -EBUSY;
         sync_port *port;
         reg_dma_rw_cfg cfg = {.en = regk_dma_yes};
         reg_dma_rw_intr_mask intr_mask = {.data = regk_dma_yes};
 
+        lock_kernel();
         DEBUG(printk(KERN_DEBUG "Open sync serial port %d\n", dev));
 
         if (dev < 0 || dev >= NBR_PORTS || !ports[dev].enabled)
         {
                 DEBUG(printk(KERN_DEBUG "Invalid minor %d\n", dev));
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out;
         }
         port = &ports[dev];
         /* Allow open this device twice (assuming one reader and one writer) */
         if (port->busy == 2)
         {
                 DEBUG(printk(KERN_DEBUG "Device is busy.. \n"));
-                return -EBUSY;
+                goto out;
         }
 
 
@@ -459,7 +463,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                                 "synchronous serial 0 dma tr",
                                                 &ports[0])) {
                                         printk(KERN_CRIT "Can't allocate sync serial port 0 IRQ");
-                                        return -EBUSY;
+                                        goto out;
                                 } else if (request_irq(DMA_IN_INTR_VECT,
                                                 rx_interrupt,
                                                 0,
@@ -467,7 +471,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                                 &ports[0])) {
                                         free_irq(DMA_OUT_INTR_VECT, &port[0]);
                                         printk(KERN_CRIT "Can't allocate sync serial port 0 IRQ");
-                                        return -EBUSY;
+                                        goto out;
                                 } else if (crisv32_request_dma(OUT_DMA_NBR,
                                                 "synchronous serial 0 dma tr",
                                                 DMA_VERBOSE_ON_ERROR,
@@ -476,7 +480,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                         free_irq(DMA_OUT_INTR_VECT, &port[0]);
                                         free_irq(DMA_IN_INTR_VECT, &port[0]);
                                         printk(KERN_CRIT "Can't allocate sync serial port 0 TX DMA channel");
-                                        return -EBUSY;
+                                        goto out;
                                 } else if (crisv32_request_dma(IN_DMA_NBR,
                                                 "synchronous serial 0 dma rec",
                                                 DMA_VERBOSE_ON_ERROR,
@@ -486,7 +490,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                         free_irq(DMA_OUT_INTR_VECT, &port[0]);
                                         free_irq(DMA_IN_INTR_VECT, &port[0]);
                                         printk(KERN_CRIT "Can't allocate sync serial port 1 RX DMA channel");
-                                        return -EBUSY;
+                                        goto out;
                                 }
 #endif
                         }
@@ -499,7 +503,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                                 "synchronous serial 1 dma tr",
                                                 &ports[1])) {
                                         printk(KERN_CRIT "Can't allocate sync serial port 1 IRQ");
-                                        return -EBUSY;
+                                        goto out;
                                 } else if (request_irq(DMA7_INTR_VECT,
                                                        rx_interrupt,
                                                        0,
@@ -507,7 +511,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                                        &ports[1])) {
                                         free_irq(DMA6_INTR_VECT, &ports[1]);
                                         printk(KERN_CRIT "Can't allocate sync serial port 3 IRQ");
-                                        return -EBUSY;
+                                        goto out;
                                 } else if (crisv32_request_dma(
                                                 SYNC_SER1_TX_DMA_NBR,
                                                 "synchronous serial 1 dma tr",
@@ -517,7 +521,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                         free_irq(DMA6_INTR_VECT, &ports[1]);
                                         free_irq(DMA7_INTR_VECT, &ports[1]);
                                         printk(KERN_CRIT "Can't allocate sync serial port 3 TX DMA channel");
-                                        return -EBUSY;
+                                        goto out;
                                 } else if (crisv32_request_dma(
                                                 SYNC_SER1_RX_DMA_NBR,
                                                 "synchronous serial 3 dma rec",
@@ -528,7 +532,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                         free_irq(DMA6_INTR_VECT, &ports[1]);
                                         free_irq(DMA7_INTR_VECT, &ports[1]);
                                         printk(KERN_CRIT "Can't allocate sync serial port 3 RX DMA channel");
-                                        return -EBUSY;
+                                        goto out;
                                 }
 #endif
                         }
@@ -554,7 +558,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                                 "synchronous serial manual irq",
                                                 &ports[0])) {
                                         printk("Can't allocate sync serial manual irq");
-                                        return -EBUSY;
+                                        goto out;
                                 }
                         }
 #ifdef CONFIG_ETRAXFS
@@ -565,7 +569,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
                                                 "synchronous serial manual irq",
                                                 &ports[1])) {
                                         printk(KERN_CRIT "Can't allocate sync serial manual irq");
-                                        return -EBUSY;
+                                        goto out;
                                 }
                         }
 #endif
@@ -578,7 +582,10 @@ static int sync_serial_open(struct inode *inode, struct file *file)
         } /* port->init_irqs */
 
         port->busy++;
-        return 0;
+        ret = 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int sync_serial_release(struct inode *inode, struct file *file)
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index a9c3334e46c9..952a24b2f5a9 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -194,7 +194,7 @@ void stop_this_cpu(void* dummy)
 /* Other calls */
 void smp_send_stop(void)
 {
-        smp_call_function(stop_this_cpu, NULL, 1, 0);
+        smp_call_function(stop_this_cpu, NULL, 0);
 }
 
 int setup_profiling_timer(unsigned int multiplier)
@@ -316,8 +316,7 @@ int send_ipi(int vector, int wait, cpumask_t cpu_mask)
  * You must not call this function with disabled interrupts or from a
  * hardware interrupt handler or from a bottom half handler.
  */
-int smp_call_function(void (*func)(void *info), void *info,
-                      int nonatomic, int wait)
+int smp_call_function(void (*func)(void *info), void *info, int wait)
 {
         cpumask_t cpu_mask = CPU_MASK_ALL;
         struct call_data_struct data;