Merge branch 'linus' into core/generic-dma-coherent

[pandora-kernel.git] / arch / blackfin / mach-bf561 / coreb.c

diff --git a/arch/blackfin/mach-bf561/coreb.c b/arch/blackfin/mach-bf561/coreb.c
index 8526478..8598098 100644 (file)
--- a/arch/blackfin/mach-bf561/coreb.c
+++ b/arch/blackfin/mach-bf561/coreb.c
@@ -32,7 +32,6 @@
 #include <linux/device.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/uaccess.h>
 #include <linux/fs.h>
 #include <asm/dma.h>
@@ -195,9 +194,9 @@ static loff_t coreb_lseek(struct file *file, loff_t offset, int origin)
        return ret;
 }
 
+/* No BKL needed here */
 static int coreb_open(struct inode *inode, struct file *file)
 {
-       lock_kernel();
        spin_lock_irq(&coreb_lock);
 
        if (coreb_status & COREB_IS_OPEN)
@@ -206,12 +205,10 @@ static int coreb_open(struct inode *inode, struct file *file)
        coreb_status |= COREB_IS_OPEN;
 
        spin_unlock_irq(&coreb_lock);
-       unlock_kernel();
        return 0;
 
  out_busy:
        spin_unlock_irq(&coreb_lock);
-       unlock_kernel();
        return -EBUSY;
 }