diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-09 21:27:06 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-14 17:36:50 +0200 |
| commit | 9e8ab74ddaa591575f599248080a1f0d917a56ee (patch) | |
| tree | 4e019037c2a5aa8a6efb626b6e12f5ff4407b7ff | |
| parent | 6783b9cd7104470a3afab51c205c5aea53a2858f (diff) | |
| download | blackbird-op-linux-9e8ab74ddaa591575f599248080a1f0d917a56ee.tar.gz blackbird-op-linux-9e8ab74ddaa591575f599248080a1f0d917a56ee.zip | |
nvram: Drop the bkl from non-generic nvram_llseek()
Drop the bkl from nvram_llseek() as it obviously protects nothing.
The file offset is safe in essence.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <1255116426-7270-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | drivers/char/nvram.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index 88cee4099be9..2100a8f7bd86 100644 --- 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 @@ -214,7 +213,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 +224,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; } |
