---

yaml --- r: 173196 b: refs/heads/master c: 9e8ab74 h: refs/heads/master v: v3
git-mirror · Oct 14, 2009 · 6dfd115 · 6dfd115
1 parent 06e0652
commit 6dfd115
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6783b9cd7104470a3afab51c205c5aea53a2858f
+refs/heads/master: 9e8ab74ddaa591575f599248080a1f0d917a56ee
diff --git a/trunk/drivers/char/nvram.c b/trunk/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;
 }