Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of: arch/powerpc/Kconfig
2008-07-15 15:44:51 +10:00
parent 585583d95c 85082fd7cb
commit 43d2548bb2
1806 changed files with 120841 additions and 38604 deletions
@@ -699,6 +699,7 @@ static int viotap_open(struct inode *inode, struct file *file)
 	if (op == NULL)
 		return -ENOMEM;

+	lock_kernel();
 	get_dev_info(file->f_path.dentry->d_inode, &devi);

 	/* Note: We currently only support one mode! */
@@ -729,6 +730,7 @@ static int viotap_open(struct inode *inode, struct file *file)

 free_op:
 	free_op_struct(op);
+	unlock_kernel();
 	return ret;
 }