diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c index 20b2d61d9ff2..5e185fa5942a 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c @@ -32,12 +32,11 @@ #include #include #include - +#include "linux-crypto.h" #define CHKSUM_BLOCK_SIZE 1 #define CHKSUM_DIGEST_SIZE 4 - static u32 __adler32(u32 cksum, unsigned char const *p, size_t len) { return zlib_adler32(cksum, p, len); @@ -135,10 +134,8 @@ int cfs_crypto_adler32_register(void) { return crypto_register_shash(&alg); } -EXPORT_SYMBOL(cfs_crypto_adler32_register); void cfs_crypto_adler32_unregister(void) { crypto_unregister_shash(&alg); } -EXPORT_SYMBOL(cfs_crypto_adler32_unregister); diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c index 048a4f28f900..aa3fffed1519 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c @@ -30,7 +30,7 @@ #include #include #include "../../../include/linux/libcfs/libcfs.h" -#include "../../../include/linux/libcfs/linux/linux-crypto.h" +#include "linux-crypto.h" /** * Array of hash algorithm speed in MByte per second */ diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h similarity index 72% rename from drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h rename to drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h index 97c771cf691f..18e8cd4d8758 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h @@ -22,28 +22,8 @@ * GPL HEADER END */ -/* - * Copyright 2012 Xyratex Technology Limited - */ - -/** - * Linux crypto hash specific functions. - */ - -/** - * Functions for start/stop shash CRC32 algorithm. - */ -int cfs_crypto_crc32_register(void); -void cfs_crypto_crc32_unregister(void); - /** * Functions for start/stop shash adler32 algorithm. */ int cfs_crypto_adler32_register(void); void cfs_crypto_adler32_unregister(void); - -/** - * Functions for start/stop shash crc32 pclmulqdq - */ -int cfs_crypto_crc32_pclmul_register(void); -void cfs_crypto_crc32_pclmul_unregister(void);