Skip to content

Commit

Permalink
Merge tag 'linux-kselftest-next-5.11-rc3' of git://git.kernel.org/pub…
Browse files Browse the repository at this point in the history
…/scm/linux/kernel/git/shuah/linux-kselftest

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
  • Loading branch information
torvalds committed Jan 9, 2021
2 parents 50dbd96 + df00d02 commit 8f3d849
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions tools/testing/selftests/vDSO/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-only
vdso_test
vdso_test_abi
vdso_test_clock_getres
vdso_test_correctness
vdso_test_gettimeofday
vdso_test_getcpu
vdso_standalone_test_x86
2 changes: 1 addition & 1 deletion tools/testing/selftests/vDSO/vdso_test_correctness.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static void test_one_clock_gettime64(int clock, const char *name)
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)vdso.tv_sec, vdso.tv_nsec,
(unsigned long long)end.tv_sec, end.tv_nsec);
Expand Down

0 comments on commit 8f3d849

Please sign in to comment.