summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-04-23 04:49:13 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-24 00:41:03 -0400
commit872f24dbc604ef585ea7eec73020dcdfaffd1956 (patch)
tree1cc35d2485a3be001329f53a69ee7dcba86539d6
parentbfb253c9b277acd9f85b1886ff82b1dd5fbff2ae (diff)
downloadop-kernel-dev-872f24dbc604ef585ea7eec73020dcdfaffd1956.zip
op-kernel-dev-872f24dbc604ef585ea7eec73020dcdfaffd1956.tar.gz
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.c2
-rw-r--r--net/tipc/port.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 6a71bea..76565c9 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -58,7 +58,7 @@ static atomic_t tipc_num_links = ATOMIC_INIT(0);
* entries has been chosen so that no hash chain exceeds 8 nodes and will
* usually be much smaller (typically only a single node).
*/
-static inline unsigned int tipc_hashfn(u32 addr)
+static unsigned int tipc_hashfn(u32 addr)
{
return addr & (NODE_HTABLE_SIZE - 1);
}
diff --git a/net/tipc/port.c b/net/tipc/port.c
index 0f40b10..4aede40 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);
static void port_timeout(unsigned long ref);
-static inline u32 port_peernode(struct tipc_port *p_ptr)
+static u32 port_peernode(struct tipc_port *p_ptr)
{
return msg_destnode(&p_ptr->phdr);
}
-static inline u32 port_peerport(struct tipc_port *p_ptr)
+static u32 port_peerport(struct tipc_port *p_ptr)
{
return msg_destport(&p_ptr->phdr);
}
OpenPOWER on IntegriCloud