diff mbox series

[-next] selftests/cgroup: Fix compile error in test_cpu.c

Message ID 20241011061153.107208-1-xiujianfeng@huaweicloud.com (mailing list archive)
State New
Headers show
Series [-next] selftests/cgroup: Fix compile error in test_cpu.c | expand

Commit Message

Xiu Jianfeng Oct. 11, 2024, 6:11 a.m. UTC 
From: Xiu Jianfeng <xiujianfeng@huawei.com>

When compiling the cgroup selftests with the following command:

make -C tools/testing/selftests/cgroup/

the compiler complains as below:

test_cpu.c: In function ‘test_cpucg_nice’:
test_cpu.c:284:39: error: incompatible type for argument 2 of ‘hog_cpus_timed’
  284 |                 hog_cpus_timed(cpucg, param);
      |                                       ^~~~~
      |                                       |
      |                                       struct cpu_hog_func_param
test_cpu.c:132:53: note: expected ‘void *’ but argument is of type ‘struct cpu_hog_func_param’
  132 | static int hog_cpus_timed(const char *cgroup, void *arg)
      |                                               ~~~~~~^~~

Fix it by passing the address of param to hog_cpus_timed().

Fixes: 2e82c0d4562a ("cgroup/rstat: Selftests for niced CPU statistics")
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
---
 tools/testing/selftests/cgroup/test_cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tejun Heo Oct. 15, 2024, 1:06 a.m. UTC | #1 
On Fri, Oct 11, 2024 at 06:11:53AM +0000, Xiu Jianfeng wrote:
> From: Xiu Jianfeng <xiujianfeng@huawei.com>
> 
> When compiling the cgroup selftests with the following command:
> 
> make -C tools/testing/selftests/cgroup/
> 
> the compiler complains as below:
> 
> test_cpu.c: In function ‘test_cpucg_nice’:
> test_cpu.c:284:39: error: incompatible type for argument 2 of ‘hog_cpus_timed’
>   284 |                 hog_cpus_timed(cpucg, param);
>       |                                       ^~~~~
>       |                                       |
>       |                                       struct cpu_hog_func_param
> test_cpu.c:132:53: note: expected ‘void *’ but argument is of type ‘struct cpu_hog_func_param’
>   132 | static int hog_cpus_timed(const char *cgroup, void *arg)
>       |                                               ~~~~~~^~~
> 
> Fix it by passing the address of param to hog_cpus_timed().
> 
> Fixes: 2e82c0d4562a ("cgroup/rstat: Selftests for niced CPU statistics")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>

Applied to cgroup/for-6.13.

Thanks.
diff mbox series

Patch

diff --git a/tools/testing/selftests/cgroup/test_cpu.c b/tools/testing/selftests/cgroup/test_cpu.c
index 201ce14cb422..a2b50af8e9ee 100644
--- a/tools/testing/selftests/cgroup/test_cpu.c
+++ b/tools/testing/selftests/cgroup/test_cpu.c
@@ -281,7 +281,7 @@  static int test_cpucg_nice(const char *root)
 
 		/* Try to keep niced CPU usage as constrained to hog_cpu as possible */
 		nice(1);
-		hog_cpus_timed(cpucg, param);
+		hog_cpus_timed(cpucg, &param);
 		exit(0);
 	} else {
 		waitpid(pid, &status, 0);