summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-09-10 21:20:48 -0700
committerDavid S. Miller <davem@davemloft.net>2017-09-10 21:20:48 -0700
commit5818f9c343d496aeefb7b5474fb41000000a3c96 (patch)
treee9943fb9c435faf4f8b05ae8f5c1509e63a54d8e
parent0adcae4d7501c2eaf8f211b8be2a1ac8cf954b5b (diff)
downloadnet_test_tools-master.tar.gz
kbench_mod: Fix build on sparc64.HEADmaster
get_tick() is not a good function name, namespace wise, so use kbench_get_tick() instead. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--kbench_mod.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/kbench_mod.c b/kbench_mod.c
index 950c66d..476f9d4 100644
--- a/kbench_mod.c
+++ b/kbench_mod.c
@@ -15,7 +15,7 @@
*/
#ifdef CONFIG_SPARC64
-static inline unsigned long long get_tick(void)
+static inline unsigned long long kbench_get_tick(void)
{
unsigned long long t;
@@ -23,7 +23,7 @@ static inline unsigned long long get_tick(void)
return t;
}
#elif defined(CONFIG_X86)
-static inline unsigned long long get_tick(void)
+static inline unsigned long long kbench_get_tick(void)
{
unsigned long long t;
@@ -32,12 +32,12 @@ static inline unsigned long long get_tick(void)
return t;
}
#elif defined(CONFIG_POWERPC)
-static inline unsigned long long get_tick(void)
+static inline unsigned long long kbench_get_tick(void)
{
return get_cycles();
}
#else
-#error Unsupported architecture, please implement get_tick()
+#error Unsupported architecture, please implement kbench_get_tick()
#endif
#undef IP_ROUTE_HAVE_PREALLOC
@@ -142,9 +142,9 @@ static void do_full_output_lookup_bench(void)
flow_init(&fl4);
- t1 = get_tick();
+ t1 = kbench_get_tick();
rt = route_output(&init_net, &fl4);
- t2 = get_tick();
+ t2 = kbench_get_tick();
if (!IS_ERR(rt))
ip_rt_put(rt);
@@ -202,9 +202,9 @@ static void do_full_input_lookup_bench(void)
}
local_bh_disable();
- t1 = get_tick();
+ t1 = kbench_get_tick();
err = ip_route_input(skb, flow_dst_ip_addr, flow_src_ip_addr, flow_tos, dev);
- t2 = get_tick();
+ t2 = kbench_get_tick();
local_bh_enable();
if (err) {
@@ -266,9 +266,9 @@ static void do_full_lookup_prealloc_bench(void)
flow_init(&fl4);
- t1 = get_tick();
+ t1 = kbench_get_tick();
rt = ip_route_output_flow_prealloc(&init_net, &fl4, NULL, &rt_stack.dst);
- t2 = get_tick();
+ t2 = kbench_get_tick();
if (!IS_ERR(rt))
ip_rt_put(rt);
@@ -315,14 +315,14 @@ static void do_fib_lookup_bench(void)
{
struct fib_table *table;
- t1 = get_tick();
+ t1 = kbench_get_tick();
table = fib_get_table(&init_net, RT_TABLE_MAIN);
if (!table) {
pr_info("fib_lookup: No main table.\n");
return;
}
err = fib_table_lookup(table, &fl4, &res, FIB_LOOKUP_NOREF);
- t2 = get_tick();
+ t2 = kbench_get_tick();
}
tdiff = t2 - t1;
pr_info("fib_lookup tdiff: %llu\n", tdiff);
@@ -407,9 +407,9 @@ static void do_new_lookup_bench(void)
return;
}
}
- t1 = get_tick();
+ t1 = kbench_get_tick();
err = new_output_lookup(&fl, &rt);
- t2 = get_tick();
+ t2 = kbench_get_tick();
if (err) {
pr_info("new_output_lookup: err=%d\n", err);