diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 05:31:17 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 05:31:17 -0500 |
commit | f108c898ddae4bb1146ed9e46ce4470725d945c4 (patch) | |
tree | bb887907e0448d4d903f853c33b3c55a863412e2 /lib/string.c | |
parent | 904cb3677f3adcd3d837be0a0d0b14251ba8d6f7 (diff) | |
parent | 68055915c1c22489f9658bd2b7391bb11b2cf4e4 (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/string.c')
-rw-r--r-- | lib/string.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/string.c b/lib/string.c index 2fc20aa06f84..10063300b830 100644 --- a/lib/string.c +++ b/lib/string.c | |||
@@ -598,6 +598,22 @@ void *memset(void *s, int c, size_t count) | |||
598 | EXPORT_SYMBOL(memset); | 598 | EXPORT_SYMBOL(memset); |
599 | #endif | 599 | #endif |
600 | 600 | ||
601 | /** | ||
602 | * memzero_explicit - Fill a region of memory (e.g. sensitive | ||
603 | * keying data) with 0s. | ||
604 | * @s: Pointer to the start of the area. | ||
605 | * @count: The size of the area. | ||
606 | * | ||
607 | * memzero_explicit() doesn't need an arch-specific version as | ||
608 | * it just invokes the one of memset() implicitly. | ||
609 | */ | ||
610 | void memzero_explicit(void *s, size_t count) | ||
611 | { | ||
612 | memset(s, 0, count); | ||
613 | OPTIMIZER_HIDE_VAR(s); | ||
614 | } | ||
615 | EXPORT_SYMBOL(memzero_explicit); | ||
616 | |||
601 | #ifndef __HAVE_ARCH_MEMCPY | 617 | #ifndef __HAVE_ARCH_MEMCPY |
602 | /** | 618 | /** |
603 | * memcpy - Copy one area of memory to another | 619 | * memcpy - Copy one area of memory to another |