diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:10:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:10:48 -0800 |
| commit | ccb6dd87174f4f71a0d15838a70a2b97bed6e203 (patch) | |
| tree | e8eb6536f12311a6f25f2e51ba991b19900b9fb0 /include/linux | |
| parent | d62f43c548aa4bf76b6206b02f178a3a570d1114 (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')
| -rw-r--r-- | include/linux/if_arp.h | 1 | ||||
| -rw-r--r-- | include/linux/isdnif.h | 2 | ||||
| -rw-r--r-- | include/linux/locks.h | 8 |
3 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index b43c299448df..9843b91077d2 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -35,6 +35,7 @@ #define ARPHRD_IEEE802 6 /* IEEE 802.2 Ethernet/TR/TB */ #define ARPHRD_ARCNET 7 /* ARCnet */ #define ARPHRD_APPLETLK 8 /* APPLEtalk */ +#define ARPHRD_IEEE1394 9 /* IEEE 1394 IPv4 - RFC 2734 */ #define ARPHRD_DLCI 15 /* Frame Relay DLCI */ #define ARPHRD_ATM 19 /* ATM */ #define ARPHRD_METRICOM 23 /* Metricom STRIP (new IANA id) */ diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h index cca81b6b50a5..e09c9cccee02 100644 --- a/include/linux/isdnif.h +++ b/include/linux/isdnif.h @@ -1,4 +1,4 @@ -/* $Id: isdnif.h,v 1.37.6.4 2001/06/09 15:14:19 kai Exp $ +/* $Id: isdnif.h,v 1.37.6.5 2001/06/11 22:08:38 kai Exp $ * Linux ISDN subsystem * 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 |