Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Rename copyuser_power7_vmx.c to vmx-helper.c

Subsequent patches will add more VMX library functions and it makes
sense to keep all the c-code helper functions in the one file.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Anton Blanchard and committed by
Benjamin Herrenschmidt
6f7839e5 ac1dc365

+7 -7
+1 -1
arch/powerpc/lib/Makefile
··· 24 24 25 25 ifeq ($(CONFIG_PPC64),y) 26 26 obj-$(CONFIG_SMP) += locks.o 27 - obj-$(CONFIG_ALTIVEC) += copyuser_power7_vmx.o 27 + obj-$(CONFIG_ALTIVEC) += vmx-helper.o 28 28 endif 29 29 30 30 obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
+4 -4
arch/powerpc/lib/copyuser_power7.S
··· 61 61 ld r15,STK_REG(r15)(r1) 62 62 ld r14,STK_REG(r14)(r1) 63 63 .Ldo_err3: 64 - bl .exit_vmx_copy 64 + bl .exit_vmx_usercopy 65 65 ld r0,STACKFRAMESIZE+16(r1) 66 66 mtlr r0 67 67 b .Lexit ··· 290 290 mflr r0 291 291 std r0,16(r1) 292 292 stdu r1,-STACKFRAMESIZE(r1) 293 - bl .enter_vmx_copy 293 + bl .enter_vmx_usercopy 294 294 cmpwi r3,0 295 295 ld r0,STACKFRAMESIZE+16(r1) 296 296 ld r3,STACKFRAMESIZE+48(r1) ··· 507 507 err3; stb r0,0(r3) 508 508 509 509 15: addi r1,r1,STACKFRAMESIZE 510 - b .exit_vmx_copy /* tail call optimise */ 510 + b .exit_vmx_usercopy /* tail call optimise */ 511 511 512 512 .Lvmx_unaligned_copy: 513 513 /* Get the destination 16B aligned */ ··· 710 710 err3; stb r0,0(r3) 711 711 712 712 15: addi r1,r1,STACKFRAMESIZE 713 - b .exit_vmx_copy /* tail call optimise */ 713 + b .exit_vmx_usercopy /* tail call optimise */ 714 714 #endif /* CONFiG_ALTIVEC */
+2 -2
arch/powerpc/lib/copyuser_power7_vmx.c arch/powerpc/lib/vmx-helper.c
··· 22 22 #include <linux/hardirq.h> 23 23 #include <asm/switch_to.h> 24 24 25 - int enter_vmx_copy(void) 25 + int enter_vmx_usercopy(void) 26 26 { 27 27 if (in_interrupt()) 28 28 return 0; ··· 44 44 * This function must return 0 because we tail call optimise when calling 45 45 * from __copy_tofrom_user_power7 which returns 0 on success. 46 46 */ 47 - int exit_vmx_copy(void) 47 + int exit_vmx_usercopy(void) 48 48 { 49 49 pagefault_enable(); 50 50 return 0;