diff options
| author | Thomas Zimmermann <[email protected]> | 2023-10-11 09:50:59 +0200 | 
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2023-10-11 09:50:59 +0200 | 
| commit | 57390019b68b83f96eb98f490367b9df1f2d77cb (patch) | |
| tree | e6d4b6c75efdd2d7fb7d37f980688c491be3ff6a /tools/testing/selftests/resctrl/resctrl_val.c | |
| parent | e5f9d543419c78ac58f3b3557bc5a76b20ff600b (diff) | |
| parent | 389af786f92ecdff35883551d54bf4e507ffcccb (diff) | |
Merge drm/drm-next into drm-misc-next
Updating drm-misc-next to the state of Linux v6.6-rc2.
Signed-off-by: Thomas Zimmermann <[email protected]>
Diffstat (limited to 'tools/testing/selftests/resctrl/resctrl_val.c')
| -rw-r--r-- | tools/testing/selftests/resctrl/resctrl_val.c | 7 | 
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c index ab1eab1e7ff6..f0f6c5f6e98b 100644 --- a/tools/testing/selftests/resctrl/resctrl_val.c +++ b/tools/testing/selftests/resctrl/resctrl_val.c @@ -648,10 +648,6 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)  			return ret;  	} -	ret = remount_resctrlfs(param->mum_resctrlfs); -	if (ret) -		return ret; -  	/*  	 * If benchmark wasn't successfully started by child, then child should  	 * kill parent, so save parent's pid @@ -763,7 +759,7 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)  	/* Test runs until the callback setup() tells the test to stop. */  	while (1) { -		ret = param->setup(1, param); +		ret = param->setup(param);  		if (ret == END_OF_TESTS) {  			ret = 0;  			break; @@ -788,7 +784,6 @@ unregister:  	signal_handler_unregister();  out:  	kill(bm_pid, SIGKILL); -	umount_resctrlfs();  	return ret;  }  |