Skip to content

L
linux
Commit 6c5ace44 authored by Anton Blanchard's avatar Anton Blanchard
Browse files
Options

Merge samba.org:/scratch/anton/linux-2.5_work 

into samba.org:/scratch/anton/linux-2.5_syscall_cleanup_clean
parents 273cbb5a 7c992e1c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 215 deletions
arch/ppc64/kernel/entry.S
View file @ 6c5ace44
...@@ -113,10 +113,6 @@ _GLOBAL(DoSyscall) ...@@ -113,10 +113,6 @@ _GLOBAL(DoSyscall)
clrldi r4,r4,32 clrldi r4,r4,32
clrldi r5,r5,32 clrldi r5,r5,32
clrldi r6,r6,32 clrldi r6,r6,32
#if 0 /* XXX Why not ??? - Anton */
clrldi r7,r7,32
clrldi r8,r8,32
#endif
b 17f b 17f
15: 15:
#endif #endif
...@@ -187,10 +183,6 @@ _GLOBAL(ret_from_syscall_1) ...@@ -187,10 +183,6 @@ _GLOBAL(ret_from_syscall_1)
clrldi r4,r4,32 clrldi r4,r4,32
clrldi r5,r5,32 clrldi r5,r5,32
clrldi r6,r6,32 clrldi r6,r6,32
#if 0 /* XXX Why not ??? - Anton */
clrldi r7,r7,32
clrldi r8,r8,32
#endif
b 57f b 57f
55: 55:
#endif #endif
......
arch/ppc64/kernel/misc.S
View file @ 6c5ace44
...@@ -505,8 +505,8 @@ _GLOBAL(kernel_thread) ...@@ -505,8 +505,8 @@ _GLOBAL(kernel_thread)
.balign 8 .balign 8
_GLOBAL(sys_call_table32) _GLOBAL(sys_call_table32)
.llong .sys_ni_syscall /* 0 - old "setup()" system call */ .llong .sys_ni_syscall /* 0 - old "setup()" system call */
.llong .sys32_exit .llong .sys_exit
.llong .sys32_fork .llong .sys_fork
.llong .sys_read .llong .sys_read
.llong .sys_write .llong .sys_write
.llong .sys32_open /* 5 */ .llong .sys32_open /* 5 */
...@@ -522,7 +522,7 @@ _GLOBAL(sys_call_table32) ...@@ -522,7 +522,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_chmod /* 15 */ .llong .sys_chmod /* 15 */
.llong .sys_lchown .llong .sys_lchown
.llong .sys_ni_syscall /* old break syscall holder */ .llong .sys_ni_syscall /* old break syscall holder */
.llong .sys32_stat .llong .sys_ni_syscall /* old stat syscall holder */
.llong .sys32_lseek .llong .sys32_lseek
.llong .sys_getpid /* 20 */ .llong .sys_getpid /* 20 */
.llong .sys32_mount .llong .sys32_mount
...@@ -532,7 +532,7 @@ _GLOBAL(sys_call_table32) ...@@ -532,7 +532,7 @@ _GLOBAL(sys_call_table32)
.llong .ppc64_sys32_stime /* 25 */ .llong .ppc64_sys32_stime /* 25 */
.llong .sys32_ptrace .llong .sys32_ptrace
.llong .sys_alarm .llong .sys_alarm
.llong .sys32_fstat .llong .sys_ni_syscall /* old fstat syscall holder */
.llong .sys32_pause .llong .sys32_pause
.llong .sys32_utime /* 30 */ .llong .sys32_utime /* 30 */
.llong .sys_ni_syscall /* old stty syscall holder */ .llong .sys_ni_syscall /* old stty syscall holder */
...@@ -588,11 +588,11 @@ _GLOBAL(sys_call_table32) ...@@ -588,11 +588,11 @@ _GLOBAL(sys_call_table32)
.llong .sys32_setgroups .llong .sys32_setgroups
.llong .ppc32_select .llong .ppc32_select
.llong .sys_symlink .llong .sys_symlink
.llong .sys32_lstat .llong .sys_ni_syscall /* old sys_lstat syscall holder */
.llong .sys32_readlink /* 85 */ .llong .sys32_readlink /* 85 */
.llong .sys_uselib .llong .sys_uselib
.llong .sys32_swapon .llong .sys_swapon
.llong .sys32_reboot .llong .sys_reboot
.llong .old32_readdir .llong .old32_readdir
.llong .sys32_mmap /* 90 */ .llong .sys32_mmap /* 90 */
.llong .sys_munmap .llong .sys_munmap
...@@ -605,7 +605,7 @@ _GLOBAL(sys_call_table32) ...@@ -605,7 +605,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_ni_syscall /* old profil syscall holder */ .llong .sys_ni_syscall /* old profil syscall holder */
.llong .sys32_statfs .llong .sys32_statfs
.llong .sys32_fstatfs /* 100 */ .llong .sys32_fstatfs /* 100 */
.llong .sys_ni_syscall /* old ioperm syscall holder */ .llong .sys_ioperm
.llong .sys32_socketcall .llong .sys32_socketcall
.llong .sys32_syslog .llong .sys32_syslog
.llong .sys32_setitimer .llong .sys32_setitimer
...@@ -624,7 +624,7 @@ _GLOBAL(sys_call_table32) ...@@ -624,7 +624,7 @@ _GLOBAL(sys_call_table32)
.llong .sys32_ipc .llong .sys32_ipc
.llong .sys_fsync .llong .sys_fsync
.llong .ppc32_sigreturn .llong .ppc32_sigreturn
.llong .sys32_clone /* 120 */ .llong .sys_clone /* 120 */
.llong .sys32_setdomainname .llong .sys32_setdomainname
.llong .ppc64_newuname .llong .ppc64_newuname
.llong .sys_ni_syscall /* old modify_ldt syscall holder */ .llong .sys_ni_syscall /* old modify_ldt syscall holder */
...@@ -638,7 +638,7 @@ _GLOBAL(sys_call_table32) ...@@ -638,7 +638,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_quotactl .llong .sys_quotactl
.llong .sys32_getpgid .llong .sys32_getpgid
.llong .sys_fchdir .llong .sys_fchdir
.llong .sys32_bdflush .llong .sys_bdflush
.llong .sys32_sysfs /* 135 */ .llong .sys32_sysfs /* 135 */
.llong .sys32_personality .llong .sys32_personality
.llong .sys_ni_syscall /* for afs_syscall */ .llong .sys_ni_syscall /* for afs_syscall */
...@@ -693,10 +693,10 @@ _GLOBAL(sys_call_table32) ...@@ -693,10 +693,10 @@ _GLOBAL(sys_call_table32)
.llong .sys32_sendfile .llong .sys32_sendfile
.llong .sys_ni_syscall /* streams1 */ .llong .sys_ni_syscall /* streams1 */
.llong .sys_ni_syscall /* streams2 */ .llong .sys_ni_syscall /* streams2 */
.llong .sys32_vfork .llong .sys_vfork
.llong .sys32_getrlimit /* 190 */ .llong .sys32_getrlimit /* 190 */
.llong .sys32_readahead .llong .sys32_readahead
.llong .sys_ni_syscall /* 192 - reserved - mmap2 */ .llong .ppc32_mmap2
.llong .sys32_truncate64 /* 193 - truncate64 */ .llong .sys32_truncate64 /* 193 - truncate64 */
.llong .sys32_ftruncate64 /* 194 - ftruncate64 */ .llong .sys32_ftruncate64 /* 194 - ftruncate64 */
.llong .sys_stat64 /* 195 - stat64 */ .llong .sys_stat64 /* 195 - stat64 */
...@@ -730,8 +730,9 @@ _GLOBAL(sys_call_table32) ...@@ -730,8 +730,9 @@ _GLOBAL(sys_call_table32)
.llong .sys32_sched_getaffinity .llong .sys32_sched_getaffinity
.llong .sys_ni_syscall /* reserved for security */ .llong .sys_ni_syscall /* reserved for security */
.llong .sys_ni_syscall /* 225 - reserved for tux */ .llong .sys_ni_syscall /* 225 - reserved for tux */
.llong .sys32_sendfile64
.rept NR_syscalls-225 .rept NR_syscalls-226
.llong .sys_ni_syscall .llong .sys_ni_syscall
.endr .endr
#endif #endif
...@@ -756,7 +757,7 @@ _GLOBAL(sys_call_table) ...@@ -756,7 +757,7 @@ _GLOBAL(sys_call_table)
.llong .sys_chmod /* 15 */ .llong .sys_chmod /* 15 */
.llong .sys_lchown .llong .sys_lchown
.llong .sys_ni_syscall /* old break syscall holder */ .llong .sys_ni_syscall /* old break syscall holder */
.llong .sys_stat .llong .sys_ni_syscall /* old stat syscall holder */
.llong .sys_lseek .llong .sys_lseek
.llong .sys_getpid /* 20 */ .llong .sys_getpid /* 20 */
.llong .sys_mount .llong .sys_mount
...@@ -766,7 +767,7 @@ _GLOBAL(sys_call_table) ...@@ -766,7 +767,7 @@ _GLOBAL(sys_call_table)
.llong .ppc64_sys_stime /* 25 */ .llong .ppc64_sys_stime /* 25 */
.llong .sys_ptrace .llong .sys_ptrace
.llong .sys_alarm .llong .sys_alarm
.llong .sys_fstat .llong .sys_ni_syscall /* old sys_fstat syscall holder */
.llong .sys_pause .llong .sys_pause
.llong .sys_utime /* 30 */ .llong .sys_utime /* 30 */
.llong .sys_ni_syscall /* old stty syscall holder */ .llong .sys_ni_syscall /* old stty syscall holder */
...@@ -822,7 +823,7 @@ _GLOBAL(sys_call_table) ...@@ -822,7 +823,7 @@ _GLOBAL(sys_call_table)
.llong .sys_setgroups .llong .sys_setgroups
.llong .sys_select .llong .sys_select
.llong .sys_symlink .llong .sys_symlink
.llong .sys_lstat .llong .sys_ni_syscall /* old sys_lstat syscall holder */
.llong .sys_readlink /* 85 */ .llong .sys_readlink /* 85 */
.llong .sys_uselib .llong .sys_uselib
.llong .sys_swapon .llong .sys_swapon
...@@ -839,7 +840,7 @@ _GLOBAL(sys_call_table) ...@@ -839,7 +840,7 @@ _GLOBAL(sys_call_table)
.llong .sys_ni_syscall /* old profil syscall holder */ .llong .sys_ni_syscall /* old profil syscall holder */
.llong .sys_statfs .llong .sys_statfs
.llong .sys_fstatfs /* 100 */ .llong .sys_fstatfs /* 100 */
.llong .sys_ni_syscall /* old ioperm syscall holder */ .llong .sys_ioperm
.llong .sys_socketcall .llong .sys_socketcall
.llong .sys_syslog .llong .sys_syslog
.llong .sys_setitimer .llong .sys_setitimer
...@@ -964,7 +965,8 @@ _GLOBAL(sys_call_table) ...@@ -964,7 +965,8 @@ _GLOBAL(sys_call_table)
.llong .sys_sched_getaffinity .llong .sys_sched_getaffinity
.llong .sys_ni_syscall /* reserved for security */ .llong .sys_ni_syscall /* reserved for security */
.llong .sys_ni_syscall /* reserved for tux */ .llong .sys_ni_syscall /* reserved for tux */
.llong .sys_ni_syscall /* reserved for sendfile64 */
.rept NR_syscalls-225 .rept NR_syscalls-226
.llong .sys_ni_syscall .llong .sys_ni_syscall
.endr .endr
arch/ppc64/kernel/process.c
View file @ 6c5ace44
...@@ -259,19 +259,19 @@ int get_fpexc_mode(struct task_struct *tsk, unsigned long adr) ...@@ -259,19 +259,19 @@ int get_fpexc_mode(struct task_struct *tsk, unsigned long adr)
return put_user(val, (unsigned int *) adr); return put_user(val, (unsigned int *) adr);
} }
int sys_clone(int p1, int p2, int p3, int p4, int p5, int p6, int sys_clone(unsigned long clone_flags, u32 p2, u32 p3, u32 p4, u32 p5,
struct pt_regs *regs) u32 p6, struct pt_regs *regs)
{ {
struct task_struct *p; struct task_struct *p;
if (regs->msr & MSR_FP) if (regs->msr & MSR_FP)
giveup_fpu(current); giveup_fpu(current);
p = do_fork(p1 & ~CLONE_IDLETASK, regs->gpr[1], regs, 0); p = do_fork(clone_flags & ~CLONE_IDLETASK, regs->gpr[1], regs, 0);
return IS_ERR(p) ? PTR_ERR(p) : p->pid; return IS_ERR(p) ? PTR_ERR(p) : p->pid;
} }
int sys_fork(int p1, int p2, int p3, int p4, int p5, int p6, int sys_fork(u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6,
struct pt_regs *regs) struct pt_regs *regs)
{ {
struct task_struct *p; struct task_struct *p;
...@@ -283,7 +283,7 @@ int sys_fork(int p1, int p2, int p3, int p4, int p5, int p6, ...@@ -283,7 +283,7 @@ int sys_fork(int p1, int p2, int p3, int p4, int p5, int p6,
return IS_ERR(p) ? PTR_ERR(p) : p->pid; return IS_ERR(p) ? PTR_ERR(p) : p->pid;
} }
int sys_vfork(int p1, int p2, int p3, int p4, int p5, int p6, int sys_vfork(u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6,
struct pt_regs *regs) struct pt_regs *regs)
{ {
struct task_struct *p; struct task_struct *p;
......
arch/ppc64/kernel/sys32.S
View file @ 6c5ace44
...@@ -44,14 +44,10 @@ _GLOBAL(sys32_getsockopt) ...@@ -44,14 +44,10 @@ _GLOBAL(sys32_getsockopt)
clrldi r7, r7, 32 /* int *optlen parm */ clrldi r7, r7, 32 /* int *optlen parm */
b .sys_getsockopt b .sys_getsockopt
_GLOBAL(sys32_bdflush) _GLOBAL(ppc32_mmap2)
extsw r4,r4 /* sign extend long data parm */
b .sys_bdflush
_GLOBAL(sys32_mmap2)
clrldi r7, r7, 32 /* unsigned long fd parm */ clrldi r7, r7, 32 /* unsigned long fd parm */
extsw r8, r8 /* off_t offset */ clrldi r8, r8, 32 /* unsigned long pgoff */
b .sys_mmap b .sys32_mmap2
_GLOBAL(sys32_socketcall) /* r3=call, r4=args */ _GLOBAL(sys32_socketcall) /* r3=call, r4=args */
cmpwi r3, 1 cmpwi r3, 1
......
arch/ppc64/kernel/sys_ppc32.c
View file @ 6c5ace44
This diff is collapsed.
include/asm-ppc64/unistd.h
View file @ 6c5ace44
...@@ -235,6 +235,7 @@ ...@@ -235,6 +235,7 @@
#define __NR_sched_getaffinity 223 #define __NR_sched_getaffinity 223
#define __NR_security 224 #define __NR_security 224
#define __NR_tuxcall 225 #define __NR_tuxcall 225
#define __NR_sendfile64 226
#define __NR(n) #n #define __NR(n) #n
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7