The patch titled
hpet: remove the BKL
has been removed from the -mm tree. Its filename was
hpet-remove-the-bkl.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: hpet: remove the BKL
From: David John <davidjon@xxxxxxxxxxx>
Concurrent access is protected by the spin lock hpet_lock. The BKL
is not required.
Signed-off-by: David John <davidjon@xxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/hpet.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff -puN drivers/char/hpet.c~hpet-remove-the-bkl drivers/char/hpet.c
--- a/drivers/char/hpet.c~hpet-remove-the-bkl
+++ a/drivers/char/hpet.c
@@ -252,7 +252,6 @@ static int hpet_open(struct inode *inode
if (file->f_mode & FMODE_WRITE)
return -EINVAL;
- lock_kernel();
spin_lock_irq(&hpet_lock);
for (devp = NULL, hpetp = hpets; hpetp && !devp; hpetp = hpetp->hp_next)
@@ -266,7 +265,6 @@ static int hpet_open(struct inode *inode
if (!devp) {
spin_unlock_irq(&hpet_lock);
- unlock_kernel();
return -EBUSY;
}
@@ -274,7 +272,6 @@ static int hpet_open(struct inode *inode
devp->hd_irqdata = 0;
devp->hd_flags |= HPET_OPEN;
spin_unlock_irq(&hpet_lock);
- unlock_kernel();
hpet_timer_set_irq(devp);
@@ -434,15 +431,12 @@ static int hpet_release(struct inode *in
return 0;
}
-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
+static long hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
-static int
-hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg)
+static long
+hpet_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- struct hpet_dev *devp;
-
- devp = file->private_data;
+ struct hpet_dev *devp = file->private_data;
return hpet_ioctl_common(devp, cmd, arg, 0);
}
@@ -549,13 +543,13 @@ static inline unsigned long hpet_time_di
return (unsigned long)m;
}
-static int
+static long
hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
{
struct hpet_timer __iomem *timer;
struct hpet __iomem *hpet;
struct hpets *hpetp;
- int err;
+ long err;
unsigned long v;
switch (cmd) {
@@ -587,7 +581,9 @@ hpet_ioctl_common(struct hpet_dev *devp,
free_irq(devp->hd_irq, devp);
devp->hd_irq = 0;
}
+ spin_lock_irq(&hpet_lock);
devp->hd_flags ^= HPET_IE;
+ spin_unlock_irq(&hpet_lock);
break;
case HPET_INFO:
{
@@ -616,7 +612,9 @@ hpet_ioctl_common(struct hpet_dev *devp,
err = -ENXIO;
break;
}
+ spin_lock_irq(&hpet_lock);
devp->hd_flags |= HPET_PERIODIC;
+ spin_unlock_irq(&hpet_lock);
break;
case HPET_DPI:
v = readq(&timer->hpet_config);
@@ -630,7 +628,9 @@ hpet_ioctl_common(struct hpet_dev *devp,
v ^= Tn_TYPE_CNF_MASK;
writeq(v, &timer->hpet_config);
}
+ spin_lock_irq(&hpet_lock);
devp->hd_flags &= ~HPET_PERIODIC;
+ spin_unlock_irq(&hpet_lock);
break;
case HPET_IRQFREQ:
if (!kernel && (arg > hpet_max_freq) &&
@@ -655,7 +655,7 @@ static const struct file_operations hpet
.llseek = no_llseek,
.read = hpet_read,
.poll = hpet_poll,
- .ioctl = hpet_ioctl,
+ .unlocked_ioctl = hpet_ioctl,
.open = hpet_open,
.release = hpet_release,
.fasync = hpet_fasync,
_
Patches currently in -mm which might be from davidjon@xxxxxxxxxxx are
origin.patch
hpet-remove-the-bkl.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
