Skip to content

Commit

Permalink
powerpc: Rename copyuser_power7_vmx.c to vmx-helper.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anton Blanchard authored and Benjamin Herrenschmidt committed Jul 3, 2012
1 parent ac1dc36 commit 6f7839e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions arch/powerpc/lib/copyuser_power7.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 6f7839e

Please sign in to comment.