1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/macintosh/nvram.c b/drivers/macintosh/nvram.c
index b195d753d2ed..c876349c32de 100644
--- a/drivers/macintosh/nvram.c
+++ b/drivers/macintosh/nvram.c
@@ -13,7 +13,6 @@
 #include <linux/fcntl.h>
 #include <linux/nvram.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/nvram.h>
 
@@ -21,7 +20,6 @@
 
 static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
 {
-        lock_kernel();
         switch (origin) {
         case 1:
                 offset += file->f_pos;
@@ -30,12 +28,10 @@ static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
                 offset += NVRAM_SIZE;
                 break;
         }
-        if (offset < 0) {
-                unlock_kernel();
+        if (offset < 0)
                 return -EINVAL;
-        }
+
         file->f_pos = offset;
-        unlock_kernel();
         return file->f_pos;
 }
 
@@ -76,8 +72,7 @@ static ssize_t write_nvram(struct file *file, const char __user *buf,
         return p - buf;
 }
 
-static int nvram_ioctl(struct inode *inode, struct file *file,
-        unsigned int cmd, unsigned long arg)
+static long nvram_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         switch(cmd) {
                 case PMAC_NVRAM_GET_OFFSET: