Commit 93048c09 authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Greg Kroah-Hartman
Browse files

lib: Fix ia64 bootloader linkage 



kbuild robot reports that since commit ce76d938 ("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: ce76d938 ("lib: Add memcat_p(): paste 2 pointer arrays together")
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Reported-by: default avatarkbuild 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9793c1fd

lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ 
	 flex_proportions.o ratelimit.o show_mem.o \

	 is_single_threaded.o plist.o decompress.o kobject_uevent.o \

	 earlycpio.o seq_buf.o siphash.o dec_and_lock.o \

	 nmi_backtrace.o nodemask.o win_minmax.o

	 nmi_backtrace.o nodemask.o win_minmax.o memcat_p.o



lib-$(CONFIG_PRINTK) += dump_stack.o

lib-$(CONFIG_MMU) += ioremap.o

lib/memcat_p.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
// 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);

lib/string.c

+0 −30
Original line number Diff line number Diff line
@@ -891,36 +891,6 @@ void *memscan(void *addr, int c, size_t size) 
EXPORT_SYMBOL(memscan);

#endif



/*

 * 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);



#ifndef __HAVE_ARCH_STRSTR

/**

 * strstr - Find the first substring in a %NUL terminated string

lib/test_memcat_p.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Test cases for memcat_p() in lib/string.c

 * Test cases for memcat_p() in lib/memcat_p.c

 */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

CRA Git | Maintained and supported by SUSTech CRA and CCSE