From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 16 Dec 2009 08:53:24 +0000 (+0100)
Subject: Add Solaris helper object
X-Git-Tag: fio-1.37~13
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d0983d0124fff305d0945098fe7b4b9c44657fd8;p=fio.git

Add Solaris helper object

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/Makefile.solaris b/Makefile.solaris
index b87a92f9..bf9c90a9 100644
--- a/Makefile.solaris
+++ b/Makefile.solaris
@@ -4,7 +4,7 @@ PROGS	= fio
 SCRIPTS = fio_generate_plots
 OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \
 	eta.o verify.o memory.o io_u.o parse.o mutex.o options.o \
-	rbtree.o fifo.o smalloc.o filehash.o lib/strsep.o helpers.o
+	rbtree.o fifo.o smalloc.o filehash.o lib/strsep.o helpers.o solaris.o
 
 OBJS += crc/crc7.o
 OBJS += crc/crc16.o
diff --git a/os/os-solaris.h b/os/os-solaris.h
index 175654e8..c6419d83 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -103,17 +103,4 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
 #define FIO_MADV_FREE	MADV_FREE
 #endif
 
-/*
- * Some Solaris versions don't have posix_memalign(), provide a private
- * weak alternative
- */
-static inline int __weak posix_memalign(void **ptr, size_t align, size_t size)
-{
-	*ptr = memalign(align, size);
-	if (*ptr)
-		return 0;
-
-	return ENOMEM;
-}
-
 #endif
diff --git a/solaris.c b/solaris.c
new file mode 100644
index 00000000..869e8d89
--- /dev/null
+++ b/solaris.c
@@ -0,0 +1,16 @@
+#include <stdlib.h>
+#include <errno.h>
+#include "compiler/compiler.h"
+
+/*
+ * Some Solaris versions don't have posix_memalign(), provide a private
+ * weak alternative
+ */
+int __weak posix_memalign(void **ptr, size_t align, size_t size)
+{
+	*ptr = memalign(align, size);
+	if (*ptr)
+		return 0;
+
+	return ENOMEM;
+}