diff options
| author | Andy Lutomirski <luto@mit.edu> | 2011-08-05 22:22:06 -0400 |
|---|---|---|
| committer | Andy Lutomirski <luto@mit.edu> | 2011-08-05 22:22:06 -0400 |
| commit | 74e8edb0cb3c2421f35754bcd2c364b540946c0a (patch) | |
| tree | 0258c78a2e9fcc57b36de85f3e2e981d0b13d78f | |
| parent | bdc5ae11deb1f59ffc115c79624f7b14f7ad2709 (diff) | |
| parent | e2ac42169006d76325ddc13f3ff84e979f031d44 (diff) | |
| download | misc-tests-74e8edb0cb3c2421f35754bcd2c364b540946c0a.tar.gz | |
Merge branch 'master' of gitorious.org:linux-test-utils/linux-clock-tests
| -rw-r--r-- | test_vsyscall.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test_vsyscall.cc b/test_vsyscall.cc index afeeb90..9b72417 100644 --- a/test_vsyscall.cc +++ b/test_vsyscall.cc @@ -192,14 +192,15 @@ int test(int argc, char **argv) printf("Testing getcpu...\n"); unsigned cpu_vdso, cpu_vsys, node_vdso, node_vsys; - ret_vdso = vdso_getcpu(&cpu_vdso, &node_vdso, 0); + if (vdso_getcpu) + ret_vdso = vdso_getcpu(&cpu_vdso, &node_vdso, 0); ret_vsys = vgetcpu(&cpu_vsys, &node_vsys, 0); - if (ret_vdso) + if (ret_vdso && vdso_getcpu) printf(" vDSO failed (ret:%ld)\n", (unsigned long)ret_vdso); if (ret_vsys) printf(" vsyscall failed (ret:%ld)\n", (unsigned long)ret_vdso); if (ret_vdso == 0 && ret_vsys == 0) { - if (cpu_vdso != cpu_vsys) + if (vdso_getcpu && cpu_vdso != cpu_vsys) printf(" cpu mismatch (vdso:%u vsyscall:%u)!\n", cpu_vdso, cpu_vsys); else if (node_vdso != node_vsys) printf(" node mismatch (vdso:%u vsyscall:%u)!\n", node_vdso, node_vsys); |