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

selftests: kvm: fix build with glibc >= 2.30

Browse Source 
[ Upstream commit e37f9f139f ]

Glibc-2.30 gained gettid() wrapper, selftests fail to compile:

lib/assert.c:58:14: error: static declaration of ‘gettid’ follows non-static declaration
   58 | static pid_t gettid(void)
      |              ^~~~~~
In file included from /usr/include/unistd.h:1170,
                 from include/test_util.h:18,
                 from lib/assert.c:10:
/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here
   34 | extern __pid_t gettid (void) __THROW;
      |                ^~~~~~

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Vitaly Kuznetsov
2019-11-13 13:51:15 +01:00
committed by Greg Kroah-Hartman
parent 15479dd156
commit a806e2a35d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/kvm/lib/assert.c
View File

@ -56,7 +56,7 @@ static void test_dump_stack(void)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
} }
static pid_t gettid(void) static pid_t _gettid(void)
{ {
return syscall(SYS_gettid); return syscall(SYS_gettid);
} }
@ -73,7 +73,7 @@ test_assert(bool exp, const char *exp_str,
fprintf(stderr, "==== Test Assertion Failure ====\n" fprintf(stderr, "==== Test Assertion Failure ====\n"
" %s:%u: %s\n" " %s:%u: %s\n"
" pid=%d tid=%d - %s\n", " pid=%d tid=%d - %s\n",
file, line, exp_str, getpid(), gettid(), file, line, exp_str, getpid(), _gettid(),
strerror(errno)); strerror(errno));
test_dump_stack(); test_dump_stack();
if (fmt) { if (fmt) {