ppc64: Remove code which zero/sign extends arguments 5 and 6, its done unconditionall...

diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
index 82e12b85ccc39725a31fe697d9c7158a2a94cf30..3153f4914ebc730d148e959c28cf2f98a127e820 100644 (file)
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@ -487,7 +487,7 @@ _GLOBAL(sys_call_table32)
        .llong .sys_lchown
        .llong .sys_ni_syscall          /* old break syscall */
        .llong .sys_ni_syscall          /* old stat syscall */
-       .llong .sys32_lseek
+       .llong .ppc32_lseek
        .llong .sys_getpid              /* 20 */
        .llong .sys32_mount
        .llong .sys_oldumount
@@ -558,7 +558,7 @@ _GLOBAL(sys_call_table32)
        .llong .sys_swapon
        .llong .sys_reboot
        .llong .old32_readdir
-       .llong .sys32_mmap              /* 90 */
+       .llong .sys_mmap                /* 90 */
        .llong .sys_munmap
        .llong .sys_truncate
        .llong .sys_ftruncate
@@ -660,7 +660,7 @@ _GLOBAL(sys_call_table32)
        .llong .sys_vfork
        .llong .sys32_getrlimit         /* 190 */
        .llong .sys32_readahead
-       .llong .ppc32_mmap2
+       .llong .sys32_mmap2
        .llong .sys32_truncate64
        .llong .sys32_ftruncate64
        .llong .sys_stat64              /* 195 */
@@ -707,7 +707,7 @@ _GLOBAL(sys_call_table32)
        .llong .sys_epoll_create
        .llong .sys_epoll_ctl
        .llong .sys_epoll_wait
-       .llong .ppc32_remap_file_pages
+       .llong .sys_remap_file_pages
 
        .rept NR_syscalls-239
                .llong .sys_ni_syscall

diff --git a/arch/ppc64/kernel/sys32.S b/arch/ppc64/kernel/sys32.S
index 4fc0b306760e8805d4f2c758eb5d2bd5c3999704..5976cb5556370bc709cf311320987f4c3df44b05 100644 (file)
--- a/arch/ppc64/kernel/sys32.S
+++ b/arch/ppc64/kernel/sys32.S
@@ -21,34 +21,10 @@
 
        .text
 
-_GLOBAL(sys32_mmap)
-       clrldi          r7, r7, 32      /* int fd parm */
-       clrldi          r8, r8, 32      /* off_t offset parm */
-       b               .sys_mmap
-
-_GLOBAL(sys32_lseek)
+_GLOBAL(ppc32_lseek)
        extsw           r4,r4           /* sign extend off_t offset parm */
        b               .sys_lseek
 
-_GLOBAL(sys32_sendto)
-       clrldi          r7, r7, 32      /* struct sockaddr *addr parm */
-       clrldi          r8, r8, 32      /* int addr_len parm */
-       b               .sys_sendto
-
-_GLOBAL(sys32_recvfrom)
-       clrldi          r7, r7, 32      /* struct sockaddr *addr parm */
-       clrldi          r8, r8, 32      /* int *addr_len parm */
-       b               .sys_recvfrom
-
-_GLOBAL(ppc32_mmap2)
-       clrldi          r7, r7, 32      /* unsigned long fd parm */
-       clrldi          r8, r8, 32      /* unsigned long pgoff */
-       b               .sys32_mmap2
-
-_GLOBAL(ppc32_remap_file_pages)
-       clrldi          r7, r7, 32
-       b               .sys_remap_file_pages
-
 _GLOBAL(sys32_socketcall)      /* r3=call, r4=args */
        cmpwi           r3, 1
        blt-            .do_einval
@@ -141,8 +117,8 @@ _STATIC(do_sys_sendto) /* sys32_sendto(int, u32, compat_size_t, unsigned int, u3
        lwz             r5,8(r10)
        lwz             r6,12(r10)
        lwz             r7,16(r10)
-       lwa             r8,20(r10)
-       b               .sys32_sendto
+       lwz             r8,20(r10)
+       b               .sys_sendto
 
 _STATIC(do_sys_recvfrom) /* sys32_recvfrom(int, u32, compat_size_t, unsigned int, u32, u32) */
        mr              r10,r4
@@ -152,7 +128,7 @@ _STATIC(do_sys_recvfrom) /* sys32_recvfrom(int, u32, compat_size_t, unsigned int
        lwz             r6,12(r10)
        lwz             r7,16(r10)
        lwz             r8,20(r10)
-       b               .sys32_recvfrom
+       b               .sys_recvfrom
 
 _STATIC(do_sys_shutdown) /* sys_shutdown(int, int) */
        mr              r10,r4