Commit 84924e2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-next-5.16-rc1' of... 

Merge tag 'linux-kselftest-next-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest updates from Shuah Khan:
 "Fixes to compile time errors and warnings"

* tag 'linux-kselftest-next-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/core: fix conflicting types compile error for close_range()
  selftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv()
  selftests: kvm: fix mismatched fclose() after popen()
parents 6ab1d483 f35dcaa0

tools/testing/selftests/core/close_range_test.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static inline int sys_close_range(unsigned int fd, unsigned int max_fd, 
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

#endif



TEST(close_range)

TEST(core_close_range)

{

	int i, ret;

	int open_fds[101];

tools/testing/selftests/kvm/x86_64/mmio_warning_test.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ int get_warnings_count(void) 
	f = popen("dmesg | grep \"WARNING:\" | wc -l", "r");

	if (fscanf(f, "%d", &warnings) < 1)

		warnings = 0;

	fclose(f);

	pclose(f);



	return warnings;

}

tools/testing/selftests/x86/test_vsyscall.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int test_process_vm_readv(void) 
	}



	if (vsyscall_map_r) {

		if (!memcmp(buf, (const void *)0xffffffffff600000, 4096)) {

		if (!memcmp(buf, remote.iov_base, sizeof(buf))) {

			printf("[OK]\tIt worked and read correct data\n");

		} else {

			printf("[FAIL]\tIt worked but returned incorrect data\n");