lkml.org 
[lkml]   [2009]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] hpet: Remove BKL from hpet_open
From 8dea55a14071c1b3445fc8a934f96c47dd35a1e1 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Sun, 18 Oct 2009 22:07:01 +0200
Subject: [PATCH] hpet: Remove BKL from hpet_open

hpet_open received the BKL from commit 48b81880519274d2a8b3e9919a47d91d05a1c964
during the BKL pushdown.

It is not needed here because everything is serialized via the hpet_lock

Signed-off-by: John Kacur <jkacur@redhat.com>
---
drivers/char/hpet.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 70a770a..5e83828 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -14,7 +14,6 @@
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/smp_lock.h>
#include <linux/types.h>
#include <linux/miscdevice.h>
#include <linux/major.h>
@@ -251,7 +250,6 @@ static int hpet_open(struct inode *inode, struct file *file)
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)
@@ -265,7 +263,6 @@ static int hpet_open(struct inode *inode, struct file *file)

if (!devp) {
spin_unlock_irq(&hpet_lock);
- unlock_kernel();
return -EBUSY;
}

@@ -273,7 +270,6 @@ static int hpet_open(struct inode *inode, struct file *file)
devp->hd_irqdata = 0;
devp->hd_flags |= HPET_OPEN;
spin_unlock_irq(&hpet_lock);
- unlock_kernel();

hpet_timer_set_irq(devp);

--
1.6.0.6


\
 
 \ /
  Last update: 2009-10-18 22:15    [from the cache]
©2003-2011 Jasper Spaans