From 8a46db1dffaf095df2ccc5b3a9f89370139a46f2 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:00 +0200
Subject: [PATCH] --- yaml --- r: 100351 b: refs/heads/master c:
 a9c4e8f74ba26f10cf78fed7c5b863ea50988856 h: refs/heads/master i:   100349:
 0def8c46027daad83cf66ea0f0433045ca022e58   100347:
 02b22c534be53e8bf022430b99d069361b7fc96e   100343:
 8e27231b22f4d864a58fbe07ab70b1a7e721cb07   100335:
 66fd87d858d7b02bc5b80fbd201d21d45002d87a   100319:
 ecf9cbe98585052773bc97d09db1d7f30ab5f516   100287:
 4c3e5c4ea9938fde7eb120ee67b454e1c0cb0b3a   100223:
 9482a587ecb401a48d417fa3591505b2e12ffe7d   100095:
 982d6d68b6256addcc18f28b5946ef6727ce75fd   99839:
 68d3e0580f0322dc4f736346c60dd4bac328d24a   99327:
 e206a8aecbd055021f8d5408da59f2698ea712aa   98303:
 8d3fd52306c01a77327e5a8547cc363fa60bb45f v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/hw_random/core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d382d18995de..a735b0a433df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48b81880519274d2a8b3e9919a47d91d05a1c964
+refs/heads/master: a9c4e8f74ba26f10cf78fed7c5b863ea50988856
diff --git a/trunk/drivers/char/hw_random/core.c b/trunk/drivers/char/hw_random/core.c
index 662d60e44e9a..e5d583c84e4f 100644
--- a/trunk/drivers/char/hw_random/core.c
+++ b/trunk/drivers/char/hw_random/core.c
@@ -37,6 +37,7 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
@@ -86,6 +87,7 @@ static int rng_dev_open(struct inode *inode, struct file *filp)
 		return -EINVAL;
 	if (filp->f_mode & FMODE_WRITE)
 		return -EINVAL;
+	cycle_kernel_lock();
 	return 0;
 }