From 4f14a6d718489011a4f7c3d75c463cc70ed6575a Mon Sep 17 00:00:00 2001
From: Osama Albahrani <osalbahr@gmail.com>
Date: Aug 10 2025 18:18:01 +0000
Subject: [PATCH 1/2] performance: Fix errors


- Towards https://www.pagure.io/kernel-tests/issue/58

---

diff --git a/performance/lmbench3/src/bench.h b/performance/lmbench3/src/bench.h
index 8166408..6362f18 100644
--- a/performance/lmbench3/src/bench.h
+++ b/performance/lmbench3/src/bench.h
@@ -317,7 +317,7 @@ extern int handle_scheduler(int childno, int benchproc, int nbenchprocs);
 #define XACT_VERS ((u_long)1)
 #define RPC_XACT ((u_long)1)
 #define RPC_EXIT ((u_long)2)
-extern char *rpc_xact_1();
-extern char *client_rpc_xact_1();
+extern char *rpc_xact_1(char *msg, register SVCXPRT *transp);
+extern char *client_rpc_xact_1(char *argp, CLIENT *clnt);
 
 #endif /* _BENCH_H */
diff --git a/performance/lmbench3/src/lat_rpc.c b/performance/lmbench3/src/lat_rpc.c
index 3ebfb16..ac8c3c3 100644
--- a/performance/lmbench3/src/lat_rpc.c
+++ b/performance/lmbench3/src/lat_rpc.c
@@ -190,9 +190,7 @@ client_rpc_xact_1(char *argp, CLIENT *clnt)
  */
 /* ARGSUSED */
 char	*
-rpc_xact_1(msg, transp)
-     	char	*msg;
-	register SVCXPRT *transp;
+rpc_xact_1(char *msg, register SVCXPRT *transp)
 {
 	static char r = 123;
 
@@ -246,7 +244,7 @@ xact_prog_1(rqstp, transp)
 	} argument;
 	char *result;
 	bool_t (*xdr_argument)(), (*xdr_result)();
-	char *(*local)();
+	char *(*local)(char *, struct svc_req *);
 
 	switch (rqstp->rq_proc) {
 	case NULLPROC:
diff --git a/performance/lmbench3/src/lat_unix.c b/performance/lmbench3/src/lat_unix.c
index 1e321f8..9a062c1 100644
--- a/performance/lmbench3/src/lat_unix.c
+++ b/performance/lmbench3/src/lat_unix.c
@@ -71,7 +71,7 @@ void
 initialize(iter_t iterations, void* cookie)
 {
 	struct _state* pState = (struct _state*)cookie;
-	void	exit();
+	void	exit(int);
 
 	if (iterations) return;
 
diff --git a/performance/lmbench3/src/lmdd.c b/performance/lmbench3/src/lmdd.c
index 419f03f..768c3d8 100644
--- a/performance/lmbench3/src/lmdd.c
+++ b/performance/lmbench3/src/lmdd.c
@@ -84,7 +84,7 @@ int	norepeats = -1;
 	bds_msg	*m1, *m2;
 #endif
 
-uint64	getarg();
+uint64	getarg(char *s, int ac, char **av);
 int	been_there(uint64 off);
 int	getfile(char *s, int ac, char **av);
 
@@ -170,7 +170,7 @@ main(int ac, char **av)
 	int     Fork, misses, mismatch, outpat, inpat, in, timeopen, gotcnt;
 	int	slp;
 	uint64	skip, size, count;
-	void	chkarg();
+	void	chkarg(char *arg);
 	int     i;
 	uint64	off = 0;
 	int	touch;

From c0a70832cb8a165a618bc5a4989785cc963d6a09 Mon Sep 17 00:00:00 2001
From: Osama Albahrani <osalbahr@gmail.com>
Date: Aug 10 2025 18:49:00 +0000
Subject: [PATCH 2/2] performance: Fix warnings


---

diff --git a/performance/lmbench3/src/bench.h b/performance/lmbench3/src/bench.h
index 6362f18..7d0d33b 100644
--- a/performance/lmbench3/src/bench.h
+++ b/performance/lmbench3/src/bench.h
@@ -319,5 +319,6 @@ extern int handle_scheduler(int childno, int benchproc, int nbenchprocs);
 #define RPC_EXIT ((u_long)2)
 extern char *rpc_xact_1(char *msg, register SVCXPRT *transp);
 extern char *client_rpc_xact_1(char *argp, CLIENT *clnt);
+void lmbench_usage(int argc, char **argv, char* usage);
 
 #endif /* _BENCH_H */
diff --git a/performance/lmbench3/src/bw_unix.c b/performance/lmbench3/src/bw_unix.c
index aad2078..c877585 100644
--- a/performance/lmbench3/src/bw_unix.c
+++ b/performance/lmbench3/src/bw_unix.c
@@ -159,14 +159,14 @@ main(int argc, char *argv[])
 			repetitions = atoi(optarg);
 			break;
 		default:
-			lmbench_usage(argc, argv);
+			lmbench_usage(argc, argv, usage);
 			break;
 		}
 	}
 	if (optind == argc - 1) {
 		state.bytes = bytes(argv[optind]);
 	} else if (optind < argc - 1) {
-		lmbench_usage(argc, argv);
+		lmbench_usage(argc, argv, usage);
 	}
 
 	state.pid = 0;
diff --git a/performance/lmbench3/src/lat_usleep.c b/performance/lmbench3/src/lat_usleep.c
index d18d0c8..842ad06 100755
--- a/performance/lmbench3/src/lat_usleep.c
+++ b/performance/lmbench3/src/lat_usleep.c
@@ -99,7 +99,7 @@ bench_pselect(iter_t iterations, void *cookie)
 #endif /* _POSIX_SELECT */
 
 void
-interval()
+interval(int)
 {
     if (++caught == n) {
 	caught = 0;
diff --git a/performance/lmbench3/src/lib_sched.c b/performance/lmbench3/src/lib_sched.c
index 035925b..ed18660 100644
--- a/performance/lmbench3/src/lib_sched.c
+++ b/performance/lmbench3/src/lib_sched.c
@@ -91,7 +91,7 @@ handle_scheduler(int childno, int benchproc, int nbenchprocs)
 			     childno * (nbenchprocs + 1) + benchproc);
 	} else {
 		/* default action: do nothing */
-		return;
+		return 0;
 	}
 
 	return sched_pin(cpu % sched_ncpus());
diff --git a/performance/lmbench3/src/lib_timing.c b/performance/lmbench3/src/lib_timing.c
index af8cf68..7ec9652 100644
--- a/performance/lmbench3/src/lib_timing.c
+++ b/performance/lmbench3/src/lib_timing.c
@@ -1623,7 +1623,7 @@ bread(void* buf, long nbytes)
 void
 touch(char *buf, int nbytes)
 {
-	static	psize;
+	static int psize;
 
 	if (!psize) {
 		psize = getpagesize();
diff --git a/performance/lmbench3/src/lmdd.c b/performance/lmbench3/src/lmdd.c
index 768c3d8..773b8b1 100644
--- a/performance/lmbench3/src/lmdd.c
+++ b/performance/lmbench3/src/lmdd.c
@@ -634,7 +634,7 @@ chkarg(char *arg)
 }
 
 void 
-done(void)
+done()
 {
 	int	i;
 	int	step;
diff --git a/performance/lmbench3/src/lmhttp.c b/performance/lmbench3/src/lmhttp.c
index 00bd4b0..5b89f0a 100644
--- a/performance/lmbench3/src/lmhttp.c
+++ b/performance/lmbench3/src/lmhttp.c
@@ -26,7 +26,7 @@ char	*buf;
 char	*bufs[3];
 int	Dflg, dflg, nflg, lflg, fflg, zflg;
 int	data, logfile;
-void	die();
+void	die(int);
 void	worker();
 char	*http_time(void);
 char	*date(time_t *tt);
@@ -387,7 +387,7 @@ logit(int sock, char *name, int size)
 	nbytes += len;
 }
 
-void die()
+void die(int)
 {
 	if (nbytes) {
 		write(logfile, logbuf, nbytes);