From f7f51e05342f2889899821b6e53dc4ab3de42460 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:57 +0200
Subject: [PATCH] --- yaml --- r: 100390 b: refs/heads/master c:
 7eb500d1a0408c37d0c0360f066f8b7701835d68 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/um/drivers/random.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f3558e206a07..9ef748a8bf98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd6859fe836491d20ea6e57fee93e0e08ee69443
+refs/heads/master: 7eb500d1a0408c37d0c0360f066f8b7701835d68
diff --git a/trunk/arch/um/drivers/random.c b/trunk/arch/um/drivers/random.c
index 4949044773ba..6eabb7022a2d 100644
--- a/trunk/arch/um/drivers/random.c
+++ b/trunk/arch/um/drivers/random.c
@@ -7,6 +7,7 @@
  * of the GNU General Public License, incorporated herein by reference.
  */
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
@@ -33,6 +34,8 @@ static DECLARE_WAIT_QUEUE_HEAD(host_read_wait);
 
 static int rng_dev_open (struct inode *inode, struct file *filp)
 {
+	cycle_kernel_lock();
+
 	/* enforce read-only access to this chrdev */
 	if ((filp->f_mode & FMODE_READ) == 0)
 		return -EINVAL;