nvram: Fix missing smp_lock.h in nvram

[sfrench/cifs-2.6.git] / drivers / char / nvram.c

diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 88cee4099be940c294127d0a172996d90c597912..4008e2ce73c1a37e14ec5e8939d9b3a2ee59efde 100644 (file)
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -38,7 +38,6 @@
 #define NVRAM_VERSION  "1.3"
 
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/nvram.h>
 
 #define PC             1
@@ -111,6 +110,7 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/smp_lock.h>
 
 #include <asm/system.h>
 
@@ -214,7 +214,6 @@ void nvram_set_checksum(void)
 
 static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
 {
-       lock_kernel();
        switch (origin) {
        case 0:
                /* nothing to do */
@@ -226,7 +225,7 @@ static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
                offset += NVRAM_BYTES;
                break;
        }
-       unlock_kernel();
+
        return (offset >= 0) ? (file->f_pos = offset) : -EINVAL;
 }