diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2020-01-16 08:17:08 +0100 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-01-16 08:17:08 +0100 |
commit | e3419426f2ca9416590650790bc20b3884348864 (patch) | |
tree | 20edd051c24f6da2c6b4090680232ec7eb9704d6 /drivers/crypto/hisilicon/sec2/sec.h | |
parent | crypto: exynos-rng - Rename Exynos to lowercase (diff) | |
parent | crypto: hisilicon/sec2 - Use atomics instead of __sync (diff) | |
download | linux-e3419426f2ca9416590650790bc20b3884348864.tar.xz linux-e3419426f2ca9416590650790bc20b3884348864.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up hisilicon patch.
Diffstat (limited to 'drivers/crypto/hisilicon/sec2/sec.h')
-rw-r--r-- | drivers/crypto/hisilicon/sec2/sec.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/crypto/hisilicon/sec2/sec.h b/drivers/crypto/hisilicon/sec2/sec.h index 26754d0570ba..b846d73d9a85 100644 --- a/drivers/crypto/hisilicon/sec2/sec.h +++ b/drivers/crypto/hisilicon/sec2/sec.h @@ -40,7 +40,7 @@ struct sec_req { int req_id; /* Status of the SEC request */ - int fake_busy; + atomic_t fake_busy; }; /** @@ -132,8 +132,8 @@ struct sec_debug_file { }; struct sec_dfx { - u64 send_cnt; - u64 recv_cnt; + atomic64_t send_cnt; + atomic64_t recv_cnt; }; struct sec_debug { |