gendwarfksyms: use preferred form of sizeof for allocation

[modules-kpd-app]

Pull request for series with
subject: gendwarfksyms: use preferred form of sizeof for allocation
version: 1
url: https://patchwork.kernel.org/project/linux-modules/list/?series=977354

[modules-kpd-app]

Upstream branch: f4e47f3
series: https://patchwork.kernel.org/project/linux-modules/list/?series=977354
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-modules/list/?series=977354
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: gendwarfksyms: use preferred form of sizeof for allocation
Using index info to reconstruct a base tree...
M	scripts/gendwarfksyms/dwarf.c
M	scripts/gendwarfksyms/kabi.c
M	scripts/gendwarfksyms/types.c
Falling back to patching base and 3-way merge...
Auto-merging scripts/gendwarfksyms/types.c
CONFLICT (content): Merge conflict in scripts/gendwarfksyms/types.c
Auto-merging scripts/gendwarfksyms/kabi.c
Auto-merging scripts/gendwarfksyms/dwarf.c
Patch failed at 0001 gendwarfksyms: use preferred form of sizeof for allocation'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc scripts/gendwarfksyms/types.c
index 6f37289104ff,9c3b053bf061..000000000000
--- a/scripts/gendwarfksyms/types.c
+++ b/scripts/gendwarfksyms/types.c
@@@ -118,8 -121,8 +118,13 @@@ static void type_map_add(const char *na
  {
  	struct type_expansion *e;
  
++<<<<<<< HEAD
 +	if (type_map_get(name, &e)) {
 +		e = xmalloc(sizeof(struct type_expansion));
++=======
+ 	if (__type_map_get(name, &e)) {
+ 		e = xmalloc(sizeof(*e));
++>>>>>>> gendwarfksyms: use preferred form of sizeof for allocation
  		type_expansion_init(e);
  		e->name = xstrdup(name);
  
@@@ -158,12 -200,22 +163,25 @@@ static void type_map_write(FILE *file
  	if (!file)
  		return;
  
++<<<<<<< HEAD
 +	hash_for_each_safe(type_map, e, tmp, hash) {
 +		checkp(fputs(e->name, file));
++=======
+ 	hash_for_each_safe(type_map, e, tmp, hash)
+ 		++count;
+ 	es = xmalloc(count * sizeof(*es));
+ 	hash_for_each_safe(type_map, e, tmp, hash)
+ 		es[i++] = e;
+ 
+ 	qsort(es, count, sizeof(*es), cmp_expansion_name);
+ 
+ 	for (i = 0; i < count; ++i) {
+ 		checkp(fputs(es[i]->name, file));
++>>>>>>> gendwarfksyms: use preferred form of sizeof for allocation
  		checkp(fputs(" ", file));
 -		type_list_write(&es[i]->expanded, file);
 +		type_list_write(&e->expanded, file);
  		checkp(fputs("\n", file));
  	}
 -
 -	free(es);
  }
  
  static void type_map_free(void)

[modules-kpd-app]

Upstream branch: 5eb4b9a
series: https://patchwork.kernel.org/project/linux-modules/list/?series=977354
version: 1