The following changes since commit 5e0baa7f423995c4f75070d6a2ee56619e195a36:
Fix segfault when passing in size < block_size (2010-10-20 11:14:57 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (1):
A few fixes for 32-bit compiles
arch/arch-x86.h | 1 -
arch/arch-x86_64.h | 2 +-
crc/crc32c-intel.c | 2 +-
crc/crc32c.h | 2 +-
engines/binject.c | 2 +-
verify.c | 2 +-
6 files changed, 5 insertions(+), 6 deletions(-)
---
Diff of recent changes:
diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index bffd1dd..2e803cb 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -48,7 +48,6 @@ static inline unsigned long long get_cpu_clock(void)
}
#define ARCH_HAVE_FFZ
-#define ARCH_HAVE_SSE
#define ARCH_HAVE_CPU_CLOCK
#endif
diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h
index 3ea8070..6dbeee0 100644
--- a/arch/arch-x86_64.h
+++ b/arch/arch-x86_64.h
@@ -48,7 +48,7 @@ static inline unsigned long long get_cpu_clock(void)
}
#define ARCH_HAVE_FFZ
-#define ARCH_HAVE_SSE
+#define ARCH_HAVE_SSE4_2
#define ARCH_HAVE_CPU_CLOCK
#endif
diff --git a/crc/crc32c-intel.c b/crc/crc32c-intel.c
index 77d6df4..969a037 100644
--- a/crc/crc32c-intel.c
+++ b/crc/crc32c-intel.c
@@ -18,7 +18,7 @@
* Volume 2A: Instruction Set Reference, A-M
*/
-#ifdef ARCH_HAVE_SSE
+#ifdef ARCH_HAVE_SSE4_2
#if BITS_PER_LONG == 64
#define REX_PRE "0x48, "
diff --git a/crc/crc32c.h b/crc/crc32c.h
index 50f3665..596fd6c 100644
--- a/crc/crc32c.h
+++ b/crc/crc32c.h
@@ -22,7 +22,7 @@
extern uint32_t crc32c(unsigned char const *, unsigned long);
-#ifdef ARCH_HAVE_SSE
+#ifdef ARCH_HAVE_SSE4_2
extern uint32_t crc32c_intel(unsigned char const *, unsigned long);
extern int crc32c_intel_works(void);
#else
diff --git a/engines/binject.c b/engines/binject.c
index 0bdaa24..f7e56eb 100644
--- a/engines/binject.c
+++ b/engines/binject.c
@@ -146,7 +146,7 @@ static int fio_binject_getevents(struct thread_data *td, unsigned int min,
for (i = 0; i < events; i++) {
struct b_user_cmd *buc = (struct b_user_cmd *) buf + i;
- bd->events[ev_index] = (struct io_u *) buc->usr_ptr;
+ bd->events[ev_index] = (struct io_u *) (unsigned long) buc->usr_ptr;
ev_index++;
}
}
diff --git a/verify.c b/verify.c
index f537553..ea1a911 100644
--- a/verify.c
+++ b/verify.c
@@ -501,7 +501,7 @@ static int verify_trimmed_io_u(struct thread_data *td, struct io_u *io_u)
log_err("trim: verify failed at file %s offset %llu, length %lu"
", block offset %lu\n",
io_u->file->file_name, io_u->offset, io_u->buflen,
- (p - io_u->buf));
+ (unsigned long) (p - io_u->buf));
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
