powerpc: Rename copyuser_power7_vmx.c to vmx-helper.c (6f7839e5) · Commits · 戴 / test

arch/powerpc/lib/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ obj-$(CONFIG_HAVE_HW_BREAKPOINT) += sstep.o ldstfp.o

		ifeq ($(CONFIG_PPC64),y)
		obj-$(CONFIG_SMP) += locks.o
		obj-$(CONFIG_ALTIVEC) += copyuser_power7_vmx.o
		obj-$(CONFIG_ALTIVEC) += vmx-helper.o
		endif

		obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o

+4 −4

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@
		ld r15,STK_REG(r15)(r1)
		ld r14,STK_REG(r14)(r1)
		.Ldo_err3:
		bl .exit_vmx_copy
		bl .exit_vmx_usercopy
		ld r0,STACKFRAMESIZE+16(r1)
		mtlr r0
		b .Lexit
		@@ -290,7 +290,7 @@ err1; stb r0,0(r3)
		mflr r0
		std r0,16(r1)
		stdu r1,-STACKFRAMESIZE(r1)
		bl .enter_vmx_copy
		bl .enter_vmx_usercopy
		cmpwi r3,0
		ld r0,STACKFRAMESIZE+16(r1)
		ld r3,STACKFRAMESIZE+48(r1)
		@@ -507,7 +507,7 @@ err3; lbz r0,0(r4)
		err3; stb r0,0(r3)

		15: addi r1,r1,STACKFRAMESIZE
		b .exit_vmx_copy /* tail call optimise */
		b .exit_vmx_usercopy /* tail call optimise */

		.Lvmx_unaligned_copy:
		/* Get the destination 16B aligned */
		@@ -710,5 +710,5 @@ err3; lbz r0,0(r4)
		err3; stb r0,0(r3)

		15: addi r1,r1,STACKFRAMESIZE
		b .exit_vmx_copy /* tail call optimise */
		b .exit_vmx_usercopy /* tail call optimise */
		#endif /* CONFiG_ALTIVEC */

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		#include <linux/hardirq.h>
		#include <asm/switch_to.h>

		int enter_vmx_copy(void)
		int enter_vmx_usercopy(void)
		{
		if (in_interrupt())
		return 0;
		@@ -44,7 +44,7 @@ int enter_vmx_copy(void)
		* This function must return 0 because we tail call optimise when calling
		* from __copy_tofrom_user_power7 which returns 0 on success.
		*/
		int exit_vmx_copy(void)
		int exit_vmx_usercopy(void)
		{
		pagefault_enable();
		return 0;