diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 11:16:41 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 11:16:41 +0800 |
| commit | 6d7e3d89954af773c70948a54cfa2aaa15907c1c (patch) | |
| tree | 6908f5e0e1af7294c00dc4e06ed583ef62f594df /lib | |
| parent | crypto: ccp - Remove unused structure field (diff) | |
| parent | crypto: algif_aead - Disable AEAD user-space for now (diff) | |
| download | linux-dev-6d7e3d89954af773c70948a54cfa2aaa15907c1c.tar.xz linux-dev-6d7e3d89954af773c70948a54cfa2aaa15907c1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/string.c b/lib/string.c index a5792019193c..bb3d4b6993c4 100644 --- a/lib/string.c +++ b/lib/string.c @@ -607,7 +607,7 @@ EXPORT_SYMBOL(memset); void memzero_explicit(void *s, size_t count) { memset(s, 0, count); - barrier(); + barrier_data(s); } EXPORT_SYMBOL(memzero_explicit); |