Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / microblaze / kernel / entry-nommu.S

diff --git a/arch/microblaze/kernel/entry-nommu.S b/arch/microblaze/kernel/entry-nommu.S
index 1fce6b8..9083d85 100644 (file)
--- a/arch/microblaze/kernel/entry-nommu.S
+++ b/arch/microblaze/kernel/entry-nommu.S
@@ -551,30 +551,22 @@ no_work_pending:
        rtid    r14, 0
        nop
 
-sys_vfork_wrapper:
-       brid    sys_vfork
+sys_vfork:
+       brid    microblaze_vfork
        addk    r5, r1, r0
 
-sys_clone_wrapper:
-       brid    sys_clone
+sys_clone:
+       brid    microblaze_clone
        addk    r7, r1, r0
 
-sys_execve_wrapper:
-       brid    sys_execve
+sys_execve:
+       brid    microblaze_execve
        addk    r8, r1, r0
 
-sys_sigreturn_wrapper:
-       brid    sys_sigreturn
-       addk    r5, r1, r0
-
 sys_rt_sigreturn_wrapper:
        brid    sys_rt_sigreturn
        addk    r5, r1, r0
 
-sys_sigsuspend_wrapper:
-       brid    sys_rt_sigsuspend
-       addk    r6, r1, r0
-
 sys_rt_sigsuspend_wrapper:
        brid    sys_rt_sigsuspend
        addk    r7, r1, r0