summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-05 09:03:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-05 09:03:52 -0700
commitd9cee5d4f66ef36f69b0108dedbad7f7009bb6a8 (patch)
tree14dcf7cb49a884de4b5c55c5757f935c12462719 /lib
parentc02d7da3dd00cb32b58d9c87240456e19eebcc42 (diff)
parentf440c4ee3e53f767974fe60bcbc0b6687a5fb53f (diff)
downloadlinux-stable-d9cee5d4f66ef36f69b0108dedbad7f7009bb6a8.tar.gz
linux-stable-d9cee5d4f66ef36f69b0108dedbad7f7009bb6a8.tar.bz2
linux-stable-d9cee5d4f66ef36f69b0108dedbad7f7009bb6a8.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes a build problem with bcm63xx and yet another fix to the memzero_explicit function to ensure that the memset is not elided" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: hwrng: bcm63xx - Fix driver compilation lib: make memzero_explicit more robust against dead store elimination
Diffstat (limited to 'lib')
-rw-r--r--lib/string.c2
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);