diff options
| author | Ryan Libby <rlibby@FreeBSD.org> | 2017-08-09 22:58:42 +0000 |
|---|---|---|
| committer | Ryan Libby <rlibby@FreeBSD.org> | 2017-08-09 22:58:42 +0000 |
| commit | 20100e740ee82d0b80d96d4a9513335da6e5f454 (patch) | |
| tree | 2c365b40fb739b8dab8e46307154bd35ad40ac51 /contrib | |
| parent | b284b46dc4ae2b8bf946ecfafa2d95a3a319cd51 (diff) | |
| download | src-20100e740ee82d0b80d96d4a9513335da6e5f454.tar.gz src-20100e740ee82d0b80d96d4a9513335da6e5f454.zip | |
Pick 'Remove external linkage for spin_adaptive' from upstream jemalloc
Apply the changes from upstream jemalloc 048c6679. This is actually not
quite a cherry pick due to makefile difference and because FreeBSD does
not carry the msvc project files which were also modified in that
commit.
Approved by: jasone (maintainer), markj (mentor)
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=322332
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/jemalloc/include/jemalloc/internal/spin.h | 8 | ||||
| -rw-r--r-- | contrib/jemalloc/src/spin.c | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/contrib/jemalloc/include/jemalloc/internal/spin.h b/contrib/jemalloc/include/jemalloc/internal/spin.h index e2afc98cfda2..aded0fcc174d 100644 --- a/contrib/jemalloc/include/jemalloc/internal/spin.h +++ b/contrib/jemalloc/include/jemalloc/internal/spin.h @@ -1,19 +1,13 @@ #ifndef JEMALLOC_INTERNAL_SPIN_H #define JEMALLOC_INTERNAL_SPIN_H -#ifdef JEMALLOC_SPIN_C_ -# define SPIN_INLINE extern inline -#else -# define SPIN_INLINE inline -#endif - #define SPIN_INITIALIZER {0U} typedef struct { unsigned iteration; } spin_t; -SPIN_INLINE void +static inline void spin_adaptive(spin_t *spin) { volatile uint32_t i; diff --git a/contrib/jemalloc/src/spin.c b/contrib/jemalloc/src/spin.c deleted file mode 100644 index 24372c26c949..000000000000 --- a/contrib/jemalloc/src/spin.c +++ /dev/null @@ -1,4 +0,0 @@ -#define JEMALLOC_SPIN_C_ -#include "jemalloc/internal/jemalloc_preamble.h" - -#include "jemalloc/internal/spin.h" |