aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-05-12 14:53:40 +0800
committerAlex Shi <alex.shi@linaro.org>2015-05-12 14:53:40 +0800
commit8134585f1c33565ea5e752a7ba9323ed3e0921f3 (patch)
tree1fd22479884783bb498702169de744b513dd68f7 /lib
parent05f74e8baccb60882ace4d0165887368e8143f3f (diff)
parent9182148a5315d4b1de68ac74fd54cbb5da5a3703 (diff)
downloadlinux-linaro-stable-8134585f1c33565ea5e752a7ba9323ed3e0921f3.tar.gz
Merge tag 'v3.10.77' into linux-linaro-lsk
This is the 3.10.77 stable release Conflicts: drivers/video/console/Kconfig scripts/kconfig/menu.c
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 43d0781daf47..cb9ea2181557 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -598,7 +598,7 @@ EXPORT_SYMBOL(memset);
void memzero_explicit(void *s, size_t count)
{
memset(s, 0, count);
- OPTIMIZER_HIDE_VAR(s);
+ barrier();
}
EXPORT_SYMBOL(memzero_explicit);