Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index fdbcc9fd6d31..5eb83c3ca20d 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -336,14 +336,12 @@ static int nvram_ioctl(struct inode *inode, struct file *file,
 
 static int nvram_open(struct inode *inode, struct file *file)
 {
-        lock_kernel();
         spin_lock(&nvram_state_lock);
 
         if ((nvram_open_cnt && (file->f_flags & O_EXCL)) ||
             (nvram_open_mode & NVRAM_EXCL) ||
             ((file->f_mode & FMODE_WRITE) && (nvram_open_mode & NVRAM_WRITE))) {
                 spin_unlock(&nvram_state_lock);
-                unlock_kernel();
                 return -EBUSY;
         }
 
@@ -354,7 +352,6 @@ static int nvram_open(struct inode *inode, struct file *file)
         nvram_open_cnt++;
 
         spin_unlock(&nvram_state_lock);
-        unlock_kernel();
 
         return 0;
 }