leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Pull kselftest fixes from Shuah Khan:
 "Two minor fixes to vDSO test changes in this merge window"

* tag 'linux-kselftest-next-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/vDSO: fix -Wformat warning in vdso_test_correctness
  selftests/vDSO: add additional binaries to .gitignore
This commit is contained in:
Linus Torvalds
2021-01-08 17:13:52 -08:00
parent 50dbd96e4f df00d02989
commit 8f3d8491d0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/testing/selftests/vDSO/.gitignore vendored
View File

@@ -1,5 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
vdso_test vdso_test
vdso_test_abi
vdso_test_clock_getres
vdso_test_correctness
vdso_test_gettimeofday vdso_test_gettimeofday
vdso_test_getcpu vdso_test_getcpu
vdso_standalone_test_x86 vdso_standalone_test_x86

2
tools/testing/selftests/vDSO/vdso_test_correctness.c
View File

@@ -349,7 +349,7 @@ static void test_one_clock_gettime64(int clock, const char *name)
return; return;
} }
printf("\t%llu.%09ld %llu.%09ld %llu.%09ld\n", printf("\t%llu.%09lld %llu.%09lld %llu.%09lld\n",
(unsigned long long)start.tv_sec, start.tv_nsec, (unsigned long long)start.tv_sec, start.tv_nsec,
(unsigned long long)vdso.tv_sec, vdso.tv_nsec, (unsigned long long)vdso.tv_sec, vdso.tv_nsec,
(unsigned long long)end.tv_sec, end.tv_nsec); (unsigned long long)end.tv_sec, end.tv_nsec);