diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-04-16 08:50:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-04-16 08:50:51 -0700 |
| commit | e9fae7f4e0d3e4eaedb8922ed48c93a08fd7ebae (patch) | |
| tree | 9ce4ba14423d4572cff0a86c4a51c4c7747acb95 /include/linux | |
| parent | eb30e17b76311e26b47bfd3a4ef70dd2cffbf295 (diff) | |
| parent | 3b32207738936ea61c3d796ae4840e70b5fc21d5 (diff) | |
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler.h | 2 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 1daf6aaaea80..e5e72dad4a1f 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -4,9 +4,11 @@ #ifdef __CHECKER__ # define __user __attribute__((noderef, address_space(1))) # define __kernel /* default address space */ +# define __safe __attribute__((safe)) #else # define __user # define __kernel +# define __safe #endif #ifdef __KERNEL__ diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5c5a551fe630..6a821e7dbb03 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -42,13 +42,14 @@ struct divert_blk; struct vlan_group; struct ethtool_ops; - /* source back-compat hook */ + /* source back-compat hooks */ #define SET_ETHTOOL_OPS(netdev,ops) \ ( (netdev)->ethtool_ops = (ops) ) #define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev functions are available. */ -#define HAVE_FREE_NETDEV +#define HAVE_FREE_NETDEV /* free_netdev() */ +#define HAVE_NETDEV_PRIV /* netdev_priv() */ #define NET_XMIT_SUCCESS 0 #define NET_XMIT_DROP 1 /* skb dropped */ |