Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

	arch/powerpc/Kconfig

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index 06dfed9ef4c7..3e840f74d45c 100644
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
@@ -27,13 +28,16 @@ static int rds_f_open(struct inode *in, struct file *fi)
         if (rds_users)
                 return -EBUSY;
 
+        lock_kernel();
         rds_users++;
         if ((text_buffer=kmalloc(66, GFP_KERNEL)) == 0) {
                 rds_users--;
                 printk(KERN_NOTICE "aci-rds: Out of memory by open()...\n");
+                unlock_kernel();
                 return -ENOMEM;
         }
 
+        unlock_kernel();
         return 0;
 }