Эх сурвалжийг харах

hpet: BKL pushdown

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann 17 жил өмнө
parent
commit
48b8188051

+ 4 - 0
drivers/char/hpet.c

@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kernel.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/types.h>
 #include <linux/miscdevice.h>
 #include <linux/miscdevice.h>
 #include <linux/major.h>
 #include <linux/major.h>
@@ -193,6 +194,7 @@ static int hpet_open(struct inode *inode, struct file *file)
 	if (file->f_mode & FMODE_WRITE)
 	if (file->f_mode & FMODE_WRITE)
 		return -EINVAL;
 		return -EINVAL;
 
 
+	lock_kernel();
 	spin_lock_irq(&hpet_lock);
 	spin_lock_irq(&hpet_lock);
 
 
 	for (devp = NULL, hpetp = hpets; hpetp && !devp; hpetp = hpetp->hp_next)
 	for (devp = NULL, hpetp = hpets; hpetp && !devp; hpetp = hpetp->hp_next)
@@ -207,6 +209,7 @@ static int hpet_open(struct inode *inode, struct file *file)
 
 
 	if (!devp) {
 	if (!devp) {
 		spin_unlock_irq(&hpet_lock);
 		spin_unlock_irq(&hpet_lock);
+		unlock_kernel();
 		return -EBUSY;
 		return -EBUSY;
 	}
 	}
 
 
@@ -214,6 +217,7 @@ static int hpet_open(struct inode *inode, struct file *file)
 	devp->hd_irqdata = 0;
 	devp->hd_irqdata = 0;
 	devp->hd_flags |= HPET_OPEN;
 	devp->hd_flags |= HPET_OPEN;
 	spin_unlock_irq(&hpet_lock);
 	spin_unlock_irq(&hpet_lock);
+	unlock_kernel();
 
 
 	return 0;
 	return 0;
 }
 }