summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 08:17:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 08:17:35 -0700
commit1014cfe2fb4cdd663137aafb21448cb613dd6a7d (patch)
tree13b5fc4e7036b4226d94bd33aefb74a3dbb25b6a /drivers/block
parent8123d8f17d8ba9d67e556688e4f025456ca97842 (diff)
parent4726f2a617ebd868a4fdeb5679613b897e5f1676 (diff)
downloadop-kernel-dev-1014cfe2fb4cdd663137aafb21448cb613dd6a7d.zip
op-kernel-dev-1014cfe2fb4cdd663137aafb21448cb613dd6a7d.tar.gz
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: Reduce stack_trace usage lockdep: No need to disable preemption in debug atomic ops lockdep: Actually _dec_ in debug_atomic_dec lockdep: Provide off case for redundant_hardirqs_on increment lockdep: Simplify debug atomic ops lockdep: Fix redundant_hardirqs_on incremented with irqs enabled lockstat: Make lockstat counting per cpu i8253: Convert i8253_lock to raw_spinlock
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/hd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index 034e6df..81c78b3 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -164,12 +164,12 @@ unsigned long read_timer(void)
unsigned long t, flags;
int i;
- spin_lock_irqsave(&i8253_lock, flags);
+ raw_spin_lock_irqsave(&i8253_lock, flags);
t = jiffies * 11932;
outb_p(0, 0x43);
i = inb_p(0x40);
i |= inb(0x40) << 8;
- spin_unlock_irqrestore(&i8253_lock, flags);
+ raw_spin_unlock_irqrestore(&i8253_lock, flags);
return(t - i);
}
#endif
OpenPOWER on IntegriCloud