diff options
| author | Dmitry Torokhov | 2017-05-30 04:54:21 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2017-05-30 04:54:21 +0200 |
| commit | d8f797c60661a90ee26ca9330cf85ede9aa2ec17 (patch) | |
| tree | 5038609885fc3e4cb7f329d974875ac4411c6af5 /crypto/dh.c | |
| parent | Input: tsc2007 - move header file out of I2C realm (diff) | |
| parent | Linux 4.12-rc3 (diff) | |
| download | kernel-qcow2-linux-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.tar.gz kernel-qcow2-linux-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.tar.xz kernel-qcow2-linux-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.zip | |
Merge tag 'v4.12-rc3' into next
Sync with mainline to bring in changes in platform drovers dropping
calls to sparse_keymap_free() so that we can remove it for good.
Diffstat (limited to 'crypto/dh.c')
| -rw-r--r-- | crypto/dh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/dh.c b/crypto/dh.c index ddcb528ab2cc..87e3542cf1b8 100644 --- a/crypto/dh.c +++ b/crypto/dh.c @@ -79,7 +79,8 @@ static int dh_set_params(struct dh_ctx *ctx, struct dh *params) return 0; } -static int dh_set_secret(struct crypto_kpp *tfm, void *buf, unsigned int len) +static int dh_set_secret(struct crypto_kpp *tfm, const void *buf, + unsigned int len) { struct dh_ctx *ctx = dh_get_ctx(tfm); struct dh params; |