---

yaml --- r: 95170 b: refs/heads/master c: dd9a451 h: refs/heads/master v: v3
git-mirror · Apr 30, 2008 · 20e2a0b · 20e2a0b
1 parent 82a8c21
commit 20e2a0b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f8cabb7055b98300aa0798ee0f6513dfc130cc2
+refs/heads/master: dd9a451aad4fd7d5f46d2300c0e4fb70d8914453
diff --git a/trunk/drivers/char/viocons.c b/trunk/drivers/char/viocons.c
@@ -704,8 +704,11 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
 	case KDSKBLED:
 		return 0;
 	}
-
-	return n_tty_ioctl(tty, file, cmd, arg);
+	/* FIXME: WTF is this being called for ??? */
+	lock_kernel();
+	ret =  n_tty_ioctl(tty, file, cmd, arg);
+	unlock_kernel();
+	return ret;
 }
 
 /*