From f0fd6f84e39f8bfb3a92c05ece6f311d5eebafbd Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:56 +0200
Subject: [PATCH] --- yaml --- r: 100389 b: refs/heads/master c:
 bd6859fe836491d20ea6e57fee93e0e08ee69443 h: refs/heads/master i:   100387:
 e0e4f77eb2f728989651f1df80370b92b2b36d55 v: v3

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

diff --git a/[refs] b/[refs]
index c9aa0d704237..f3558e206a07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78dccb46ddc2ff460c8b4d5ec0886964bd4b59e5
+refs/heads/master: bd6859fe836491d20ea6e57fee93e0e08ee69443
diff --git a/trunk/arch/um/drivers/mmapper_kern.c b/trunk/arch/um/drivers/mmapper_kern.c
index 67b2f55a602f..eb240323c40a 100644
--- a/trunk/arch/um/drivers/mmapper_kern.c
+++ b/trunk/arch/um/drivers/mmapper_kern.c
@@ -16,6 +16,7 @@
 #include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include "mem_user.h"
 
@@ -77,6 +78,7 @@ static int mmapper_mmap(struct file *file, struct vm_area_struct *vma)
 
 static int mmapper_open(struct inode *inode, struct file *file)
 {
+	cycle_kernel_lock();
 	return 0;
 }