projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wfcqueue: add C++ compatibility API
[urcu.git]
/
urcu
/
arch
/
s390.h
diff --git
a/urcu/arch/s390.h
b/urcu/arch/s390.h
index 6dc09a3e76c9d48963a5ddc185f07bb84a4f3eae..67461b4d6ed1c3f6ac258b0e636a6939fd942871 100644
(file)
--- a/
urcu/arch/s390.h
+++ b/
urcu/arch/s390.h
@@
-31,20
+31,23
@@
#include <urcu/compiler.h>
#include <urcu/config.h>
#include <urcu/syscall-compat.h>
#include <urcu/compiler.h>
#include <urcu/config.h>
#include <urcu/syscall-compat.h>
+#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
-#endif
+#endif
#define CAA_CACHE_LINE_SIZE 128
#define cmm_mb() __asm__ __volatile__("bcr 15,0" : : : "memory")
#define CAA_CACHE_LINE_SIZE 128
#define cmm_mb() __asm__ __volatile__("bcr 15,0" : : : "memory")
-typedef unsigned long long cycles_t;
+#define HAS_CAA_GET_CYCLES
+
+typedef uint64_t caa_cycles_t;
-static inline cycles_t caa_get_cycles (void)
+static inline c
aa_c
ycles_t caa_get_cycles (void)
{
{
- cycles_t cycles;
+ c
aa_c
ycles_t cycles;
__asm__ __volatile__("stck %0" : "=m" (cycles) : : "cc", "memory" );
__asm__ __volatile__("stck %0" : "=m" (cycles) : : "cc", "memory" );
@@
-52,14
+55,14
@@
static inline cycles_t caa_get_cycles (void)
}
/*
}
/*
- *
Define the membarrier system call number if not yet available in the
- * system headers.
+ *
On Linux, define the membarrier system call number if not yet available in
+ *
the
system headers.
*/
*/
-#if
ndef __NR_membarrier
+#if
(defined(__linux__) && !defined(__NR_membarrier))
#define __NR_membarrier 356
#endif
#define __NR_membarrier 356
#endif
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif
}
#endif
This page took
0.02476 seconds
and
4
git commands to generate.