diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2013-11-05 16:57:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 16:57:40 +1100 |
| commit | 2b656f42fc969551f64b37579f06c896a1e8c83f (patch) | |
| tree | 2e958bfb6297e3602ea07a361b249f4fb712d1a1 /kernel | |
| parent | 1130008edb2841c3621f4425a427b07f4cb3147d (diff) | |
gcov-add-support-for-gcc-47-gcov-format-fix
use kmemdup() and kcalloc()
Cc: Frantisek Hrbata <fhrbata@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/gcov/gcc_4_7.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index d91afee5bdd2..5ccb6aeebf77 100644 --- a/kernel/gcov/gcc_4_7.c +++ b/kernel/gcov/gcc_4_7.c @@ -254,11 +254,10 @@ struct gcov_info *gcov_info_dup(struct gcov_info *info) size_t fi_size; /* function info size */ size_t cv_size; /* counter values size */ - dup = kmalloc(sizeof(struct gcov_info), GFP_KERNEL); + dup = kmemdup(info, sizeof(*dup), GFP_KERNEL); if (!dup) return NULL; - *dup = *info; dup->next = NULL; dup->filename = NULL; dup->functions = NULL; @@ -267,8 +266,8 @@ struct gcov_info *gcov_info_dup(struct gcov_info *info) if (!dup->filename) goto err_free; - dup->functions = kzalloc(sizeof(struct gcov_fn_info *) * - info->n_functions, GFP_KERNEL); + dup->functions = kcalloc(sizeof(struct gcov_fn_info *), + info->n_functions, GFP_KERNEL); if (!dup->functions) goto err_free; |