Subject: [folded-merged] gcov-add-support-for-gcc-47-gcov-format-fix.patch removed from -mm tree
To: akpm@xxxxxxxxxxxxxxxxxxxx,fhrbata@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 12 Nov 2013 14:45:17 -0800
The patch titled
Subject: gcov-add-support-for-gcc-47-gcov-format-fix
has been removed from the -mm tree. Its filename was
gcov-add-support-for-gcc-47-gcov-format-fix.patch
This patch was dropped because it was folded into gcov-add-support-for-gcc-47-gcov-format.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: gcov-add-support-for-gcc-47-gcov-format-fix
use kmemdup() and kcalloc()
Cc: Frantisek Hrbata <fhrbata@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/gcov/gcc_4_7.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff -puN kernel/gcov/gcc_4_7.c~gcov-add-support-for-gcc-47-gcov-format-fix kernel/gcov/gcc_4_7.c
--- a/kernel/gcov/gcc_4_7.c~gcov-add-support-for-gcc-47-gcov-format-fix
+++ a/kernel/gcov/gcc_4_7.c
@@ -254,11 +254,10 @@ struct gcov_info *gcov_info_dup(struct g
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 g
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;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-readaheadc-do_readhead-dont-check-for-readpage.patch
mm-thp-khugepaged-add-policy-for-finding-target-node.patch
mm-factor-commit-limit-calculation.patch
kernel-printk-printkc-convert-to-pr_foo.patch
maintainers-remove-richard-purdie-as-backlight-maintainer.patch
checkpatch-extend-camelcase-types-and-ignore-existing-camelcase-uses-in-a-patch.patch
checkpatch-add-test-for-defines-of-arch_has_foo.patch
epoll-do-not-take-global-epmutex-for-simple-topologies.patch
init-do_mounts_rdc-fix-null-pointer-dereference-while-loading-initramfs.patch
drivers-rtc-rtc-as3722-add-rtc-driver.patch
fs-hfs-btreeh-remove-duplicate-defines.patch
gcov-add-support-for-gcc-47-gcov-format.patch
gcov-add-support-for-gcc-47-gcov-format-fix-fix.patch
gcov-add-support-for-gcc-47-gcov-format-checkpatch-fixes.patch
kernel-modulec-use-pr_foo.patch
kernel-gcov-fsc-use-pr_warn.patch
ipc-msg-fix-message-length-check-for-negative-values-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
