From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 26 Jul 2016 03:03:18 +0000 (-0700)
Subject: compressor: Better arch ifdefs for isal code
X-Git-Tag: v11.0.1~351^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=265899bdcc8f19d15cc13628feb596201b4976d4;p=ceph.git

compressor: Better arch ifdefs for isal code

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc
index 342677d4df0d..0852cd89862c 100644
--- a/src/compressor/zlib/ZlibCompressor.cc
+++ b/src/compressor/zlib/ZlibCompressor.cc
@@ -99,12 +99,9 @@ int ZlibCompressor::zlib_compress(const bufferlist &in, bufferlist &out)
   return 0;
 }
 
+#if __x86_64__
 int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out)
 {
-#if (__arm__)
-  derr << "Unsupported architecture" << dendl;
-  return -1;
-#else
   int ret;
   unsigned have;
   isal_zstream strm;
@@ -152,15 +149,19 @@ int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out)
   }
 
   return 0;  
-#endif
 }
+#endif
 
 int ZlibCompressor::compress(const bufferlist &in, bufferlist &out)
 {
+#if __x86_64__
   if (isal_enabled)
     return isal_compress(in, out);
   else
     return zlib_compress(in, out);
+#else
+  return zlib_compress(in, out);
+#endif
 }
 
 int ZlibCompressor::decompress(bufferlist::iterator &p, size_t compressed_size, bufferlist &out)