diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/vaddrs.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/starfire.h | 2 | ||||
| -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 |
5 files changed, 5 insertions, 10 deletions
diff --git a/include/asm-sparc/vaddrs.h b/include/asm-sparc/vaddrs.h index e2f6fbe91fc8..0470ea55e6a9 100644 --- a/include/asm-sparc/vaddrs.h +++ b/include/asm-sparc/vaddrs.h @@ -1,4 +1,4 @@ -/* $Id: vaddrs.h,v 1.26 2000/08/01 04:53:58 anton Exp $ */ +/* $Id: vaddrs.h,v 1.27 2001/07/04 00:18:18 davem Exp $ */ #ifndef _SPARC_VADDRS_H #define _SPARC_VADDRS_H diff --git a/include/asm-sparc64/starfire.h b/include/asm-sparc64/starfire.h index a738fb363a40..b606cb2b32a8 100644 --- a/include/asm-sparc64/starfire.h +++ b/include/asm-sparc64/starfire.h @@ -1,4 +1,4 @@ -/* $Id: starfire.h,v 1.1 2000/09/21 06:18:53 anton Exp $ +/* $Id: starfire.h,v 1.2 2001/07/04 00:18:18 davem Exp $ * starfire.h: Group all starfire specific code together. * * Copyright (C) 2000 Anton Blanchard (anton@samba.org) 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 |