From d351aaa85dc366d50176538caaaf27c7bda58684 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Tue, 15 Sep 2009 16:25:29 -0700
Subject: [PATCH] sysperf - call tests - fix stale compilation errors.

---
 test/sysperf/call1.c |  4 ++--
 test/sysperf/call2.c |  6 +++---
 test/sysperf/call3.c | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/sysperf/call1.c b/test/sysperf/call1.c
index 6c1c2a106c..0798801c46 100644
--- a/test/sysperf/call1.c
+++ b/test/sysperf/call1.c
@@ -10,7 +10,7 @@
 
 #define LOOP 1000000000
 
-static void nop() { }
+static void xnop() { }
 
 int
 main(int ac, char **av)
@@ -20,7 +20,7 @@ main(int ac, char **av)
     printf("call nop() function in loop\n");
     start_timing();
     for (i = 0; i < LOOP; ++i)
-	nop();
+	xnop();
     stop_timing(LOOP, "loop1/user");
     return(0);
 }
diff --git a/test/sysperf/call2.c b/test/sysperf/call2.c
index 1da21898d6..2dfb2cd729 100644
--- a/test/sysperf/call2.c
+++ b/test/sysperf/call2.c
@@ -10,9 +10,9 @@
 
 #define LOOP 1000000000
 
-static void nop(void) { }
+static void xnop(void) { }
 
-static void (*nop_ptr)(void) = nop;
+static void (*xnop_ptr)(void) = xnop;
 
 int
 main(int ac, char **av)
@@ -22,7 +22,7 @@ main(int ac, char **av)
     printf("call nop() function through function pointer in loop\n");
     start_timing();
     for (i = 0; i < LOOP; ++i)
-	nop_ptr();
+	xnop_ptr();
     stop_timing(LOOP, "loop1/user");
     return(0);
 }
diff --git a/test/sysperf/call3.c b/test/sysperf/call3.c
index 685b4c96e4..dea220bced 100644
--- a/test/sysperf/call3.c
+++ b/test/sysperf/call3.c
@@ -11,11 +11,11 @@
 #define LOOP 500000000
 
 __asm(".p2align 6");
-static void nop1(void) { }
+static void xnop1(void) { }
 __asm(".p2align 6");
-static void nop2(void) { }
+static void xnop2(void) { }
 __asm(".p2align 6");
-static void nop(void (*func)(void)) { func(); }
+static void xnop(void (*func)(void)) { func(); }
 
 int
 main(int ac, char **av)
@@ -25,20 +25,20 @@ main(int ac, char **av)
     printf("call nop() function through function pointer in loop\n");
     start_timing();
     for (i = 0; i < LOOP; ++i) {
-	nop(nop1);
-	nop(nop1);
+	xnop(xnop1);
+	xnop(xnop1);
     }
     stop_timing(LOOP * 2, "call3/nop1-1");
     start_timing();
     for (i = 0; i < LOOP; ++i) {
-	nop(nop1);
-	nop(nop2);
+	xnop(xnop1);
+	xnop(xnop2);
     }
     stop_timing(LOOP * 2, "call3/nop1-2");
     start_timing();
     for (i = 0; i < LOOP; ++i) {
-	nop(nop2);
-	nop(nop2);
+	xnop(xnop2);
+	xnop(xnop2);
     }
     stop_timing(LOOP * 2, "call3/nop2-2");
     return(0);
-- 
2.11.4.GIT