Commit 94b146ce authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] kernel_execve is identical in 32 and 64 bit 



so consolidate it into misc.S.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent aabc08dc

arch/powerpc/kernel/misc.S

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * 2 of the License, or (at your option) any later version.

 */

#include <asm/ppc_asm.h>

#include <asm/unistd.h>



	.text
@@ -43,3 +44,10 @@ _GLOBAL(add_reloc_offset) 
	add	r3,r3,r5

	mtlr	r0

	blr



_GLOBAL(kernel_execve)

	li	r0,__NR_execve

	sc

	bnslr

	neg	r3,r3

	blr

arch/powerpc/kernel/misc_32.S

+0 −7
Original line number Diff line number Diff line
@@ -793,13 +793,6 @@ _GLOBAL(kernel_thread) 
	addi	r1,r1,16

	blr



_GLOBAL(kernel_execve)

	li	r0,__NR_execve

	sc

	bnslr

	neg	r3,r3

	blr



/*

 * This routine is just here to keep GCC happy - sigh...

 */

arch/powerpc/kernel/misc_64.S

+0 −7
Original line number Diff line number Diff line
@@ -518,13 +518,6 @@ _GLOBAL(giveup_altivec) 


#endif /* CONFIG_ALTIVEC */



_GLOBAL(kernel_execve)

	li	r0,__NR_execve

	sc

	bnslr

	neg	r3,r3

	blr



/* kexec_wait(phys_cpu)

 *

 * wait for the flag to change, indicating this kernel is going away but

CRA Git | Maintained and supported by SUSTech CRA and CCSE