Merge branch 'rhashtable-fixes'

[deliverable/linux.git] / lib / string.c

diff --git a/lib/string.c b/lib/string.c
index ce81aaec38391b0fb68cef2f5ba070c9a520e49e..a5792019193cac08715b9f72304607f8746599de 100644 (file)
--- 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);
-       OPTIMIZER_HIDE_VAR(s);
+       barrier();
 }
 EXPORT_SYMBOL(memzero_explicit);