From 6dfd115c44d708d944ab39d5c9b50bb02e2d1848 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Fri, 9 Oct 2009 21:27:06 +0200
Subject: [PATCH] --- yaml --- r: 173196 b: refs/heads/master c:
 9e8ab74ddaa591575f599248080a1f0d917a56ee h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/nvram.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4913d2475ae1..1e83231a9898 100644
--- 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
index 88cee4099be9..2100a8f7bd86 100644
--- 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;
 }