These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / tools / testing / selftests / powerpc / tm / tm-syscall.c

diff --git a/kernel/tools/testing/selftests/powerpc/tm/tm-syscall.c b/kernel/tools/testing/selftests/powerpc/tm/tm-syscall.c
index 3ed8d4b..e835bf7 100644 (file)
--- a/kernel/tools/testing/selftests/powerpc/tm/tm-syscall.c
+++ b/kernel/tools/testing/selftests/powerpc/tm/tm-syscall.c
@@ -77,12 +77,23 @@ pid_t getppid_tm(bool suspend)
        exit(-1);
 }
 
+static inline bool have_htm_nosc(void)
+{
+#ifdef PPC_FEATURE2_HTM_NOSC
+       return ((long)get_auxv_entry(AT_HWCAP2) & PPC_FEATURE2_HTM_NOSC);
+#else
+       printf("PPC_FEATURE2_HTM_NOSC not defined, can't check AT_HWCAP2\n");
+       return false;
+#endif
+}
+
 int tm_syscall(void)
 {
        unsigned count = 0;
        struct timeval end, now;
 
-       SKIP_IF(!((long)get_auxv_entry(AT_HWCAP2) & PPC_FEATURE2_HTM));
+       SKIP_IF(!have_htm_nosc());
+
        setbuf(stdout, NULL);
 
        printf("Testing transactional syscalls for %d seconds...\n", TEST_DURATION);