rpm/dapl
SHA256
1
0
Fork 0
forked from pool/dapl
Code Pull Requests Activity
6a071ecea8
dapl/dapl-s390.patch

50 lines
1.3 KiB
Diff
Raw Normal View History

Accepting request 511580 from home:NMoreyChaisemartin:branches:science:HPC - Update to 2.1.10 * dtest_suite: add option to pause the test. * dtestcm: add client retry, give server time to queue up all listens * dtest: Add new man pages. (dtestx dtestcm dtestsrq) * cma: fix open_query mode, initialize attributes * ucm: up level CM timer logging, increase drep time at scale * dtest: fix return value check on do_rdma_write_with_msg * dtestx: check device capabilities and do atomic tests only if supported by HW * common: set atomic attributes based on provider/device capabilities * build: dtest_suite.sh was moved to test/scripts * mpxyd: let TX thread sleep if no open devices are referenced * mcm: when mmap req from MIC return with fail stat print WARN. * dtest_suite: remove duplicate dtest_suite.sh * dtest: enable -D option (data check) to work with scif provider * dtest_suite: fix typo in user_string var * mcm: remove logs from post send speed path * mcm proxy: push WR from MIC to host with scif mmap memory instead of scif_send. * dtest: the default size in pingpong test is set to 1 byte regardless to user input. * dtest: cleanup 4 printfs from the middle of performance test, may reduce performance. - Refresh patches against 2.1.10 OBS-URL: https://build.opensuse.org/request/show/511580 OBS-URL: https://build.opensuse.org/package/show/science:HPC/dapl?expand=0&rev=16
2017-07-20 10:49:25 +02:00
diff --git dapl/udapl/linux/dapl_osd.h dapl/udapl/linux/dapl_osd.h
index 2b255d0..d9362f5 100644
--- dapl/udapl/linux/dapl_osd.h
+++ dapl/udapl/linux/dapl_osd.h
Accepting request 502397 from science:HPC - Rename dapl-utils tests to avoid conflicts with other packages (dateutils) * dapltest => dapl-test * dtest => dapl-utest * dtestcm => dapl-testcm * dtestsrq => dapl-testsrq * dtestx => dapl-testx - Remove librdmacm and libibverbs version dependencies - Restore description of libdapl. Fix some grammar errors. - Disable dapl on armv7hl - Make dependencies on libs now coming from rdma-core versioned. - Remove unused patch dapl-rename_dtest.patch - Update to 2.1.8 git version (bsc#970668). List of changes is too long so please see the included ChangeLog. - Patches removed because the fixes are included upstream: dapl-fix_type_punning.patch dapl-autotools.patch dapl-add-s390x-platform-support.patch dapl-add-aarch64-platform-support.patch dapl-add-s390x-platform-support.patch - Add dapl-s390.patch so that the defines are also valid for s390 - Add conflicts between dapl and dapl-debug packages for devel and utils OBS-URL: https://build.opensuse.org/request/show/502397 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dapl?expand=0&rev=5
2017-06-09 15:57:33 +02:00
@@ -51,7 +51,7 @@
#if !defined (__i386__) && !defined (__ia64__) && !defined(__x86_64__) && \
!defined(__PPC__) && !defined(__PPC64__) && !defined(__s390x__) && \
- !defined(__aarch64__)
+ !defined(__aarch64__) && !defined(__s390__)
#error UNDEFINED ARCH
#endif
@@ -160,7 +160,7 @@ int dapl_os_get_env_val (
/* atomic functions */
-#ifdef __s390x__
+#if defined(__s390x__) || defined(__s390__)
#define DAPL_CS_ADD(ptr, op_val) ({ \
int old_val, new_val; \
__asm__ __volatile__( \
@@ -199,7 +199,7 @@ dapl_os_atomic_inc (
#else
IA64_FETCHADD(old_value,v,1,4);
#endif
-#elif defined(__s390x__)
+#elif defined(__s390x__) || defined(__s390__)
DAT_COUNT tmp;
DAT_COUNT delta = 1;
@@ -245,7 +245,7 @@ dapl_os_atomic_dec (
#else
IA64_FETCHADD(old_value,v,-1,4);
#endif
-#elif defined(__s390x__)
+#elif defined(__s390x__) || defined(__s390__)
DAT_COUNT tmp;
DAT_COUNT delta = -1;
@@ -307,7 +307,7 @@ dapl_os_atomic_assign (
#else
current_value = ia64_cmpxchg(acq,v,match_value,new_value,4);
#endif /* __ia64__ */
-#elif defined(__s390x__)
+#elif defined(__s390x__) || defined(__s390__)
__asm__ __volatile__(
" cs %0,%2,%1\n"
: "+d" (match_value), "=Q" (*v)
Copy Permalink