Commit bab6099a authored by Anton Blanchard's avatar Anton Blanchard

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

into samba.org:/scratch/anton/linux-2.5_ppc64_new
parents 3ede7fd3 82421cec
...@@ -564,7 +564,7 @@ _GLOBAL(sys_call_table32) ...@@ -564,7 +564,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_ni_syscall /* old mpx syscall */ .llong .sys_ni_syscall /* old mpx syscall */
.llong .sys32_setpgid .llong .sys32_setpgid
.llong .sys_ni_syscall /* old ulimit syscall */ .llong .sys_ni_syscall /* old ulimit syscall */
.llong .sys_olduname .llong .sys32_olduname
.llong .sys32_umask /* 60 */ .llong .sys32_umask /* 60 */
.llong .sys_chroot .llong .sys_chroot
.llong .sys_ustat .llong .sys_ustat
...@@ -770,7 +770,7 @@ _GLOBAL(sys_call_table) ...@@ -770,7 +770,7 @@ _GLOBAL(sys_call_table)
.llong .sys_lseek .llong .sys_lseek
.llong .sys_getpid /* 20 */ .llong .sys_getpid /* 20 */
.llong .sys_mount .llong .sys_mount
.llong .sys_oldumount .llong .sys_ni_syscall /* old umount syscall */
.llong .sys_setuid .llong .sys_setuid
.llong .sys_getuid .llong .sys_getuid
.llong .ppc64_sys_stime /* 25 */ .llong .ppc64_sys_stime /* 25 */
...@@ -807,7 +807,7 @@ _GLOBAL(sys_call_table) ...@@ -807,7 +807,7 @@ _GLOBAL(sys_call_table)
.llong .sys_ni_syscall /* old mpx syscall */ .llong .sys_ni_syscall /* old mpx syscall */
.llong .sys_setpgid .llong .sys_setpgid
.llong .sys_ni_syscall /* old ulimit syscall */ .llong .sys_ni_syscall /* old ulimit syscall */
.llong .sys_olduname .llong .sys_ni_syscall /* old uname syscall */
.llong .sys_umask /* 60 */ .llong .sys_umask /* 60 */
.llong .sys_chroot .llong .sys_chroot
.llong .sys_ustat .llong .sys_ustat
...@@ -824,7 +824,7 @@ _GLOBAL(sys_call_table) ...@@ -824,7 +824,7 @@ _GLOBAL(sys_call_table)
.llong .sys_sigpending .llong .sys_sigpending
.llong .sys_sethostname .llong .sys_sethostname
.llong .sys_setrlimit /* 75 */ .llong .sys_setrlimit /* 75 */
.llong .sys_old_getrlimit .llong .sys_ni_syscall /* old getrlimit syscall */
.llong .sys_getrusage .llong .sys_getrusage
.llong .sys_gettimeofday .llong .sys_gettimeofday
.llong .sys_settimeofday .llong .sys_settimeofday
...@@ -837,7 +837,7 @@ _GLOBAL(sys_call_table) ...@@ -837,7 +837,7 @@ _GLOBAL(sys_call_table)
.llong .sys_uselib .llong .sys_uselib
.llong .sys_swapon .llong .sys_swapon
.llong .sys_reboot .llong .sys_reboot
.llong .old_readdir .llong .sys_ni_syscall /* old readdir syscall */
.llong .sys_mmap /* 90 */ .llong .sys_mmap /* 90 */
.llong .sys_munmap .llong .sys_munmap
.llong .sys_truncate .llong .sys_truncate
...@@ -946,8 +946,8 @@ _GLOBAL(sys_call_table) ...@@ -946,8 +946,8 @@ _GLOBAL(sys_call_table)
.llong .sys_ni_syscall /* 195 - 32bit only stat64 */ .llong .sys_ni_syscall /* 195 - 32bit only stat64 */
.llong .sys_ni_syscall /* 32bit only lstat64 */ .llong .sys_ni_syscall /* 32bit only lstat64 */
.llong .sys_ni_syscall /* 32bit only fstat64 */ .llong .sys_ni_syscall /* 32bit only fstat64 */
.llong .sys_pciconfig_read .llong .sys_ni_syscall /* 32bit only pciconfig_read */
.llong .sys_pciconfig_write .llong .sys_ni_syscall /* 32bit only pciconfig_write */
.llong .sys_ni_syscall /* 200 - reserved - sys_pciconfig_iobase */ .llong .sys_ni_syscall /* 200 - reserved - sys_pciconfig_iobase */
.llong .sys_ni_syscall /* reserved for MacOnLinux */ .llong .sys_ni_syscall /* reserved for MacOnLinux */
.llong .sys_getdents64 .llong .sys_getdents64
......
...@@ -4285,6 +4285,32 @@ asmlinkage int sys32_sched_getaffinity(__kernel_pid_t32 pid, unsigned int len, ...@@ -4285,6 +4285,32 @@ asmlinkage int sys32_sched_getaffinity(__kernel_pid_t32 pid, unsigned int len,
return ret; return ret;
} }
int sys32_olduname(struct oldold_utsname * name)
{
int error;
if (!name)
return -EFAULT;
if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
return -EFAULT;
down_read(&uts_sem);
error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
error -= __put_user(0,name->sysname+__OLD_UTS_LEN);
error -= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
error -= __put_user(0,name->nodename+__OLD_UTS_LEN);
error -= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
error -= __put_user(0,name->release+__OLD_UTS_LEN);
error -= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
error -= __put_user(0,name->version+__OLD_UTS_LEN);
error -= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
error = __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
error = error ? -EFAULT : 0;
return error;
}
extern unsigned long sys_mmap(unsigned long addr, size_t len, extern unsigned long sys_mmap(unsigned long addr, size_t len,
unsigned long prot, unsigned long flags, unsigned long prot, unsigned long flags,
unsigned long fd, off_t offset); unsigned long fd, off_t offset);
......
...@@ -218,32 +218,6 @@ asmlinkage int sys_uname(struct old_utsname * name) ...@@ -218,32 +218,6 @@ asmlinkage int sys_uname(struct old_utsname * name)
return err; return err;
} }
asmlinkage int sys_olduname(struct oldold_utsname * name)
{
int error;
if (!name)
return -EFAULT;
if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
return -EFAULT;
down_read(&uts_sem);
error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
error -= __put_user(0,name->sysname+__OLD_UTS_LEN);
error -= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
error -= __put_user(0,name->nodename+__OLD_UTS_LEN);
error -= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
error -= __put_user(0,name->release+__OLD_UTS_LEN);
error -= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
error -= __put_user(0,name->version+__OLD_UTS_LEN);
error -= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
error = __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
error = error ? -EFAULT : 0;
return error;
}
asmlinkage time_t sys64_time(time_t* tloc) asmlinkage time_t sys64_time(time_t* tloc)
{ {
......
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