Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

	arch/powerpc/Kconfig

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 44e039865aa9..7d95e151513a 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -127,9 +127,13 @@ flash_read(struct file * file, char __user * buf,
 static int
 flash_open(struct inode *inode, struct file *file)
 {
-        if (test_and_set_bit(0, (void *)&flash.busy) != 0)
+        lock_kernel();
+        if (test_and_set_bit(0, (void *)&flash.busy) != 0) {
+                unlock_kernel();
                 return -EBUSY;
+        }
 
+        unlock_kernel();
         return 0;
 }