summaryrefslogtreecommitdiff
path: root/include/linux/locks.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 19:10:48 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 19:10:48 -0800
commitccb6dd87174f4f71a0d15838a70a2b97bed6e203 (patch)
treee8eb6536f12311a6f25f2e51ba991b19900b9fb0 /include/linux/locks.h
parentd62f43c548aa4bf76b6206b02f178a3a570d1114 (diff)
v2.4.6.3 -> v2.4.6.4
- David Miller: sparc and networking updates - Al Viro: SysV FS add_link off-by-two bogosity. - Jeff Garzik: merge D-Link DL2k GigE driver, other network driver cleanups - Kai Germaschewski: ISDN update - Alan Cox: more merging (MPT fusion core) - Johannes Erdfelt: USB updates - Stas Sergeev: make sure we return out of vm86 mode when interrupts get re.enabled - Rusty Russell: netfilter fixes for ipt_unclean and ip_queue - me: initialize page->age when adding it to the swap cache - Paul Mackerras: PPC updates - some subtle fs/buffer.c race conditions (Andrew Morton, me)
Diffstat (limited to 'include/linux/locks.h')
-rw-r--r--include/linux/locks.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/locks.h b/include/linux/locks.h
index 1c1f2bbb19eb..1c3fa10b9270 100644
--- a/include/linux/locks.h
+++ b/include/linux/locks.h
@@ -26,13 +26,7 @@ extern inline void lock_buffer(struct buffer_head * bh)
__wait_on_buffer(bh);
}
-extern inline void unlock_buffer(struct buffer_head *bh)
-{
- clear_bit(BH_Lock, &bh->b_state);
- smp_mb__after_clear_bit();
- if (waitqueue_active(&bh->b_wait))
- wake_up(&bh->b_wait);
-}
+extern void unlock_buffer(struct buffer_head *bh);
/*
* super-block locking. Again, interrupts may only unlock