LU-8056 libcfs: Support for linux 4.2 kernels

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-crypto-crc32pclmul.c

diff --git a/libcfs/libcfs/linux/linux-crypto-crc32pclmul.c b/libcfs/libcfs/linux/linux-crypto-crc32pclmul.c
index 9a71100..0b3abaf 100644 (file)
--- a/libcfs/libcfs/linux/linux-crypto-crc32pclmul.c
+++ b/libcfs/libcfs/linux/linux-crypto-crc32pclmul.c
@@ -32,7 +32,11 @@
 #include <crypto/internal/hash.h>
 #include <linux/crc32.h>
 #include <asm/cpufeature.h>
+#ifdef HAVE_FPU_API_HEADER
+#include <asm/fpu/api.h>
+#else
 #include <asm/i387.h>
+#endif
 #include <libcfs/libcfs.h>
 
 #define CHKSUM_BLOCK_SIZE      1
@@ -173,12 +177,11 @@ static struct shash_alg alg = {
 };
 
 #ifndef X86_FEATURE_PCLMULQDQ
-#define X86_FEATURE_PCLMULQDQ  (4 * 32 + 1)    /* PCLMULQDQ instruction */
+#define X86_FEATURE_PCLMULQDQ  (4*32+1)        /* PCLMULQDQ instruction */
 #endif
 
 int cfs_crypto_crc32_pclmul_register(void)
 {
-
        if (!boot_cpu_has(X86_FEATURE_PCLMULQDQ)) {
                CDEBUG(D_INFO, "PCLMULQDQ-NI instructions are not "
                       "detected.\n");