mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 11:35:45 +00:00
93048c0944
kbuild robot reports that since commitce76d938dd("lib: Add memcat_p(): paste 2 pointer arrays together") the ia64/hp/sim/boot fails to link: > LD arch/ia64/hp/sim/boot/bootloader > lib/string.o: In function `__memcat_p': > string.c:(.text+0x1f22): undefined reference to `__kmalloc' > string.c:(.text+0x1ff2): undefined reference to `__kmalloc' > make[1]: *** [arch/ia64/hp/sim/boot/Makefile:37: arch/ia64/hp/sim/boot/bootloader] Error 1 The reason is, the above commit, via __memcat_p(), adds a call to __kmalloc to string.o, which happens to be used in the bootloader, but there's no kmalloc or slab or anything. Since the linker would only pull in objects that contain referenced symbols, moving __memcat_p() to a different compilation unit solves the problem. Fixes:ce76d938dd("lib: Add memcat_p(): paste 2 pointer arrays together") Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Reported-by: kbuild test robot <lkp@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
35 lines
753 B
C
35 lines
753 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include <linux/slab.h>
|
|
|
|
/*
|
|
* Merge two NULL-terminated pointer arrays into a newly allocated
|
|
* array, which is also NULL-terminated. Nomenclature is inspired by
|
|
* memset_p() and memcat() found elsewhere in the kernel source tree.
|
|
*/
|
|
void **__memcat_p(void **a, void **b)
|
|
{
|
|
void **p = a, **new;
|
|
int nr;
|
|
|
|
/* count the elements in both arrays */
|
|
for (nr = 0, p = a; *p; nr++, p++)
|
|
;
|
|
for (p = b; *p; nr++, p++)
|
|
;
|
|
/* one for the NULL-terminator */
|
|
nr++;
|
|
|
|
new = kmalloc_array(nr, sizeof(void *), GFP_KERNEL);
|
|
if (!new)
|
|
return NULL;
|
|
|
|
/* nr -> last index; p points to NULL in b[] */
|
|
for (nr--; nr >= 0; nr--, p = p == b ? &a[nr] : p - 1)
|
|
new[nr] = *p;
|
|
|
|
return new;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__memcat_p);
|
|
|