From 366b608f54bd982a0cf8317c0028819c3a2db158 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 24 Sep 2013 10:17:37 -0700 Subject: [PATCH] arch/intel: use intel probe instructions for x86_64 only Not LP64, which includes ppc64 and clearly does not build. Fixes: #6283 Signed-off-by: Sage Weil Reviewed-by: Greg Farnum --- src/arch/intel.c | 6 +++--- src/common/crc32c_intel_fast.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/arch/intel.c b/src/arch/intel.c index 0513da53c237a..58668439a607b 100644 --- a/src/arch/intel.c +++ b/src/arch/intel.c @@ -5,7 +5,7 @@ int ceph_arch_intel_sse42 = 0; /* this probably isn't specific enough for x86_64? fix me someday */ -#ifdef __LP64__ +#ifdef __x86_64__ /* intel cpu? */ static void do_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, @@ -35,7 +35,7 @@ int ceph_arch_intel_probe(void) return 0; } -#else // __LP64__ +#else // __x86_64__ int ceph_arch_intel_probe(void) { @@ -43,4 +43,4 @@ int ceph_arch_intel_probe(void) return 0; } -#endif // __LP64__ +#endif // __x86_64__ diff --git a/src/common/crc32c_intel_fast.h b/src/common/crc32c_intel_fast.h index 7a394a0b82ceb..26a444f60615d 100644 --- a/src/common/crc32c_intel_fast.h +++ b/src/common/crc32c_intel_fast.h @@ -8,7 +8,7 @@ extern "C" { /* is the fast version compiled in */ extern int ceph_crc32c_intel_fast_exists(void); -#ifdef __LP64__ +#ifdef __x86_64__ extern uint32_t ceph_crc32c_intel_fast(uint32_t crc, unsigned char const *buffer, unsigned len); -- 2.39.5