diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-23 00:49:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-24 00:41:03 -0400 |
commit | 872f24dbc604ef585ea7eec73020dcdfaffd1956 (patch) | |
tree | 1cc35d2485a3be001329f53a69ee7dcba86539d6 | |
parent | bfb253c9b277acd9f85b1886ff82b1dd5fbff2ae (diff) |
tipc: remove inline instances from C source files.
Untie gcc's hands and let it do what it wants within the
individual source files. There are two files, node.c and
port.c -- only the latter effectively changes (gcc-4.5.2).
Objdump shows gcc deciding to not inline port_peernode().
Suggested-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/tipc/node.c | 2 | ||||
-rw-r--r-- | net/tipc/port.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 6a71bea91db0..76565c9916ab 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -58,7 +58,7 @@ static atomic_t tipc_num_links = ATOMIC_INIT(0); | |||
58 | * entries has been chosen so that no hash chain exceeds 8 nodes and will | 58 | * entries has been chosen so that no hash chain exceeds 8 nodes and will |
59 | * usually be much smaller (typically only a single node). | 59 | * usually be much smaller (typically only a single node). |
60 | */ | 60 | */ |
61 | static inline unsigned int tipc_hashfn(u32 addr) | 61 | static unsigned int tipc_hashfn(u32 addr) |
62 | { | 62 | { |
63 | return addr & (NODE_HTABLE_SIZE - 1); | 63 | return addr & (NODE_HTABLE_SIZE - 1); |
64 | } | 64 | } |
diff --git a/net/tipc/port.c b/net/tipc/port.c index 0f40b1055306..4aede40e592f 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c | |||
@@ -59,12 +59,12 @@ static struct sk_buff *port_build_peer_abort_msg(struct tipc_port *, u32 err); | |||
59 | static void port_timeout(unsigned long ref); | 59 | static void port_timeout(unsigned long ref); |
60 | 60 | ||
61 | 61 | ||
62 | static inline u32 port_peernode(struct tipc_port *p_ptr) | 62 | static u32 port_peernode(struct tipc_port *p_ptr) |
63 | { | 63 | { |
64 | return msg_destnode(&p_ptr->phdr); | 64 | return msg_destnode(&p_ptr->phdr); |
65 | } | 65 | } |
66 | 66 | ||
67 | static inline u32 port_peerport(struct tipc_port *p_ptr) | 67 | static u32 port_peerport(struct tipc_port *p_ptr) |
68 | { | 68 | { |
69 | return msg_destport(&p_ptr->phdr); | 69 | return msg_destport(&p_ptr->phdr); |
70 | } | 70 | } |