shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Linus Torvalds
2021-11-02 22:00:17 -07:00
parent 6ab1d4839a f35dcaa0a8
commit 84924e2e62
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/testing/selftests/core/close_range_test.c
View File

@@ -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])) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#endif #endif
TEST(close_range) TEST(core_close_range)
{ {
int i, ret; int i, ret;
int open_fds[101]; int open_fds[101];

2
tools/testing/selftests/kvm/x86_64/mmio_warning_test.c
View File

@@ -84,7 +84,7 @@ int get_warnings_count(void)
f = popen("dmesg | grep \"WARNING:\" | wc -l", "r"); f = popen("dmesg | grep \"WARNING:\" | wc -l", "r");
if (fscanf(f, "%d", &warnings) < 1) if (fscanf(f, "%d", &warnings) < 1)
warnings = 0; warnings = 0;
fclose(f); pclose(f);
return warnings; return warnings;
} }

2
tools/testing/selftests/x86/test_vsyscall.c
View File

@@ -497,7 +497,7 @@ static int test_process_vm_readv(void)
} }
if (vsyscall_map_r) { 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"); printf("[OK]\tIt worked and read correct data\n");
} else { } else {
printf("[FAIL]\tIt worked but returned incorrect data\n"); printf("[FAIL]\tIt worked but returned incorrect data\n");