diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 20:19:14 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 20:19:14 +0100 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /arch/um/drivers/random.c | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'arch/um/drivers/random.c')
| -rw-r--r-- | arch/um/drivers/random.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c index 4949044773b..6eabb7022a2 100644 --- a/arch/um/drivers/random.c +++ b/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; |