[POWERPC] Add strncmp to arch/ppc (96f1bb8a) · Commits · 戴 / test

Commit added an assembly version of strncmp to PowerPC. However, it changed a common header file between arch/ppc and arch/powerpc without adding strncmp to arch/ppc. This fixes that omission so that arch/ppc links again. Signed-off-by:

Josh Boyer <jwboyer@linux.vnet.ibm.com> Signed-off-by:

Paul Mackerras <paulus@samba.org>

arch/ppc/kernel/ppc_ksyms.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ EXPORT_SYMBOL(strncpy);
	EXPORT_SYMBOL(strcat);		EXPORT_SYMBOL(strcat);
	EXPORT_SYMBOL(strlen);		EXPORT_SYMBOL(strlen);
	EXPORT_SYMBOL(strcmp);		EXPORT_SYMBOL(strcmp);
			EXPORT_SYMBOL(strncmp);

	EXPORT_SYMBOL(csum_partial);		EXPORT_SYMBOL(csum_partial);
	EXPORT_SYMBOL(csum_partial_copy_generic);		EXPORT_SYMBOL(csum_partial_copy_generic);

arch/ppc/lib/string.S

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -121,6 +121,20 @@ _GLOBAL(strcmp)
	beq 1b		beq 1b
	blr		blr

			_GLOBAL(strncmp)
			PPC_LCMPI r5,0
			beqlr
			mtctr r5
			addi r5,r3,-1
			addi r4,r4,-1
			1: lbzu r3,1(r5)
			cmpwi 1,r3,0
			lbzu r0,1(r4)
			subf. r3,r0,r3
			beqlr 1
			bdnzt eq,1b
			blr

	_GLOBAL(strlen)		_GLOBAL(strlen)
	addi r4,r3,-1		addi r4,r3,-1
	1: lbzu r0,1(r4)		1: lbzu r0,1(r4)

Admin message