diff options
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/caam/key_gen.c | 1 | ||||
| -rw-r--r-- | drivers/crypto/hifn_795x.c | 4 | ||||
| -rw-r--r-- | drivers/crypto/n2_core.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/ux500/cryp/cryp_core.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/ux500/hash/hash_core.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c index f5c0d56764cc..f6dba10246c3 100644 --- a/drivers/crypto/caam/key_gen.c +++ b/drivers/crypto/caam/key_gen.c @@ -124,3 +124,4 @@ u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, return ret; } +EXPORT_SYMBOL(gen_split_key); diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index 88bb001719a9..fda32968a66b 100644 --- a/drivers/crypto/hifn_795x.c +++ b/drivers/crypto/hifn_795x.c @@ -821,8 +821,8 @@ static int hifn_register_rng(struct hifn_device *dev) /* * We must wait at least 256 Pk_clk cycles between two reads of the rng. */ - dev->rng_wait_time = DIV_ROUND_UP(NSEC_PER_SEC, dev->pk_clk_freq) * - 256; + dev->rng_wait_time = DIV_ROUND_UP_ULL(NSEC_PER_SEC, + dev->pk_clk_freq) * 256; dev->rng.name = dev->name; dev->rng.data_present = hifn_rng_data_present, diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index a8bd0310f8fe..aab257403b4a 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c @@ -42,7 +42,7 @@ MODULE_DESCRIPTION("Niagara2 Crypto driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_MODULE_VERSION); -#define N2_CRA_PRIORITY 300 +#define N2_CRA_PRIORITY 200 static DEFINE_MUTEX(spu_lock); diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 715c0fe0fc85..bc615cc56266 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c @@ -32,7 +32,7 @@ #include <plat/ste_dma40.h> -#include <mach/crypto-ux500.h> +#include <linux/platform_data/crypto-ux500.h> #include <mach/hardware.h> #include "cryp_p.h" diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index 873b69fd2962..632c3339895f 100644 --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c @@ -31,7 +31,7 @@ #include <crypto/scatterwalk.h> #include <crypto/algapi.h> -#include <mach/crypto-ux500.h> +#include <linux/platform_data/crypto-ux500.h> #include <mach/hardware.h> #include "hash_alg.h" |