Skip to content

L
linux
Commit 8c5a83d8 authored by Anton Blanchard's avatar Anton Blanchard
Browse files
Options

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

into samba.org:/scratch/anton/linux-2.5_ppc64
parents cfec9ecd 4f68d3e1
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 108 deletions
arch/ppc64/kernel/misc.S
View file @ 8c5a83d8
......@@ -504,7 +504,7 @@ _GLOBAL(kernel_thread)
/* Why isn't this a) automatic, b) written in 'C'? */
.balign 8
_GLOBAL(sys_call_table32)
.llong .sys_ni_syscall /* 0 - old "setup()" system call */
.llong .sys_ni_syscall /* 0 - old setup syscall */
.llong .sys_exit
.llong .sys_fork
.llong .sys_read
......@@ -521,8 +521,8 @@ _GLOBAL(sys_call_table32)
.llong .sys_mknod
.llong .sys_chmod /* 15 */
.llong .sys_lchown
.llong .sys_ni_syscall /* old break syscall holder */
.llong .sys_ni_syscall /* old stat syscall holder */
.llong .sys_ni_syscall /* old break syscall */
.llong .sys_ni_syscall /* old stat syscall */
.llong .sys32_lseek
.llong .sys_getpid /* 20 */
.llong .sys32_mount
......@@ -532,14 +532,14 @@ _GLOBAL(sys_call_table32)
.llong .ppc64_sys32_stime /* 25 */
.llong .sys32_ptrace
.llong .sys_alarm
.llong .sys_ni_syscall /* old fstat syscall holder */
.llong .sys_ni_syscall /* old fstat syscall */
.llong .sys32_pause
.llong .sys32_utime /* 30 */
.llong .sys_ni_syscall /* old stty syscall holder */
.llong .sys_ni_syscall /* old gtty syscall holder */
.llong .sys_ni_syscall /* old stty syscall */
.llong .sys_ni_syscall /* old gtty syscall */
.llong .sys32_access
.llong .sys32_nice
.llong .sys_ni_syscall /* 35 */ /* old ftime syscall holder */
.llong .sys_ni_syscall /* 35 - old ftime syscall */
.llong .sys_sync
.llong .sys32_kill
.llong .sys_rename
......@@ -548,7 +548,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_dup
.llong .sys_pipe
.llong .sys32_times
.llong .sys_ni_syscall /* old prof syscall holder */
.llong .sys_ni_syscall /* old prof syscall */
.llong .sys_brk /* 45 */
.llong .sys_setgid
.llong .sys_getgid
......@@ -556,13 +556,13 @@ _GLOBAL(sys_call_table32)
.llong .sys_geteuid
.llong .sys_getegid /* 50 */
.llong .sys_acct
.llong .sys32_umount /* recycled never used phys() */
.llong .sys_ni_syscall /* old lock syscall holder */
.llong .sys32_umount
.llong .sys_ni_syscall /* old lock syscall */
.llong .sys32_ioctl
.llong .sys32_fcntl /* 55 */
.llong .sys_ni_syscall /* old mpx syscall holder */
.llong .sys_ni_syscall /* old mpx syscall */
.llong .sys32_setpgid
.llong .sys_ni_syscall /* old ulimit syscall holder */
.llong .sys_ni_syscall /* old ulimit syscall */
.llong .sys_olduname
.llong .sys32_umask /* 60 */
.llong .sys_chroot
......@@ -588,7 +588,7 @@ _GLOBAL(sys_call_table32)
.llong .sys32_setgroups
.llong .ppc32_select
.llong .sys_symlink
.llong .sys_ni_syscall /* old sys_lstat syscall holder */
.llong .sys_ni_syscall /* old lstat syscall */
.llong .sys32_readlink /* 85 */
.llong .sys_uselib
.llong .sys_swapon
......@@ -602,7 +602,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_fchown /* 95 */
.llong .sys32_getpriority
.llong .sys32_setpriority
.llong .sys_ni_syscall /* old profil syscall holder */
.llong .sys_ni_syscall /* old profil syscall */
.llong .sys32_statfs
.llong .sys32_fstatfs /* 100 */
.llong .sys_ioperm
......@@ -614,10 +614,10 @@ _GLOBAL(sys_call_table32)
.llong .sys32_newlstat
.llong .sys32_newfstat
.llong .sys_uname
.llong .sys_ni_syscall /* 110 old iopl syscall holder */
.llong .sys_ni_syscall /* 110 old iopl syscall */
.llong .sys_vhangup
.llong .sys_ni_syscall /* old 'idle' syscall */
.llong .sys_ni_syscall /* old vm86 syscall holder */
.llong .sys_ni_syscall /* old idle syscall */
.llong .sys_ni_syscall /* old vm86 syscall */
.llong .sys32_wait4
.llong .sys_swapoff /* 115 */
.llong .sys32_sysinfo
......@@ -627,7 +627,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_clone /* 120 */
.llong .sys32_setdomainname
.llong .ppc64_newuname
.llong .sys_ni_syscall /* old modify_ldt syscall holder */
.llong .sys_ni_syscall /* old modify_ldt syscall */
.llong .sys32_adjtimex
.llong .sys_mprotect /* 125 */
.llong .sys32_sigprocmask
......@@ -691,28 +691,28 @@ _GLOBAL(sys_call_table32)
.llong .sys_capset
.llong .sys32_sigaltstack /* 185 */
.llong .sys32_sendfile
.llong .sys_ni_syscall /* streams1 */
.llong .sys_ni_syscall /* streams2 */
.llong .sys_ni_syscall /* reserved for streams1 */
.llong .sys_ni_syscall /* reserved for streams2 */
.llong .sys_vfork
.llong .sys32_getrlimit /* 190 */
.llong .sys32_readahead
.llong .ppc32_mmap2
.llong .sys32_truncate64 /* 193 - truncate64 */
.llong .sys32_ftruncate64 /* 194 - ftruncate64 */
.llong .sys_stat64 /* 195 - stat64 */
.llong .sys_lstat64 /* 196 - lstat64 */
.llong .sys_fstat64 /* 197 - fstat64 */
.llong .sys32_pciconfig_read /* 198 */
.llong .sys32_pciconfig_write /* 199 */
.llong .sys_ni_syscall /* 200 - reserved - sys_pciconfig_iobase */
.llong .sys_ni_syscall /* 201 - reserved - MacOnLinux - new */
.llong .sys_getdents64 /* 202 */
.llong .sys_pivot_root /* 203 */
.llong .sys32_fcntl64 /* 204 */
.llong .sys32_truncate64
.llong .sys32_ftruncate64
.llong .sys_stat64 /* 195 */
.llong .sys_lstat64
.llong .sys_fstat64
.llong .sys32_pciconfig_read
.llong .sys32_pciconfig_write
.llong .sys_ni_syscall /* 200 - reserved for sys_pciconfig_iobase */
.llong .sys_ni_syscall /* reserved for MacOnLinux */
.llong .sys_getdents64
.llong .sys_pivot_root
.llong .sys32_fcntl64
.llong .sys_madvise /* 205 */
.llong .sys_mincore /* 206 */
.llong .sys_gettid /* 207 */
.llong .sys_tkill /* 208 */
.llong .sys_mincore
.llong .sys_gettid
.llong .sys_tkill
.llong .sys_setxattr
.llong .sys_lsetxattr /* 210 */
.llong .sys_fsetxattr
......@@ -739,7 +739,7 @@ _GLOBAL(sys_call_table32)
.balign 8
_GLOBAL(sys_call_table)
.llong .sys_ni_syscall /* 0 - old "setup()" system call */
.llong .sys_ni_syscall /* 0 - old setup syscall */
.llong .sys_exit
.llong .sys_fork
.llong .sys_read
......@@ -756,8 +756,8 @@ _GLOBAL(sys_call_table)
.llong .sys_mknod
.llong .sys_chmod /* 15 */
.llong .sys_lchown
.llong .sys_ni_syscall /* old break syscall holder */
.llong .sys_ni_syscall /* old stat syscall holder */
.llong .sys_ni_syscall /* old break syscall */
.llong .sys_ni_syscall /* old stat syscall */
.llong .sys_lseek
.llong .sys_getpid /* 20 */
.llong .sys_mount
......@@ -767,14 +767,14 @@ _GLOBAL(sys_call_table)
.llong .ppc64_sys_stime /* 25 */
.llong .sys_ptrace
.llong .sys_alarm
.llong .sys_ni_syscall /* old sys_fstat syscall holder */
.llong .sys_ni_syscall /* old fstat syscall */
.llong .sys_pause
.llong .sys_utime /* 30 */
.llong .sys_ni_syscall /* old stty syscall holder */
.llong .sys_ni_syscall /* old gtty syscall holder */
.llong .sys_ni_syscall /* old stty syscall */
.llong .sys_ni_syscall /* old gtty syscall */
.llong .sys_access
.llong .sys_nice
.llong .sys_ni_syscall /* 35 */ /* old ftime syscall holder */
.llong .sys_ni_syscall /* 35 - old ftime syscall */
.llong .sys_sync
.llong .sys_kill
.llong .sys_rename
......@@ -783,7 +783,7 @@ _GLOBAL(sys_call_table)
.llong .sys_dup
.llong .sys_pipe
.llong .sys_times
.llong .sys_ni_syscall /* old prof syscall holder */
.llong .sys_ni_syscall /* old prof syscall */
.llong .sys_brk /* 45 */
.llong .sys_setgid
.llong .sys_getgid
......@@ -791,13 +791,13 @@ _GLOBAL(sys_call_table)
.llong .sys_geteuid
.llong .sys_getegid /* 50 */
.llong .sys_acct
.llong .sys_umount /* recycled never used phys() */
.llong .sys_ni_syscall /* old lock syscall holder */
.llong .sys_umount
.llong .sys_ni_syscall /* old lock syscall */
.llong .sys_ioctl
.llong .sys_fcntl /* 55 */
.llong .sys_ni_syscall /* old mpx syscall holder */
.llong .sys_ni_syscall /* old mpx syscall */
.llong .sys_setpgid
.llong .sys_ni_syscall /* old ulimit syscall holder */
.llong .sys_ni_syscall /* old ulimit syscall */
.llong .sys_olduname
.llong .sys_umask /* 60 */
.llong .sys_chroot
......@@ -823,7 +823,7 @@ _GLOBAL(sys_call_table)
.llong .sys_setgroups
.llong .sys_select
.llong .sys_symlink
.llong .sys_ni_syscall /* old sys_lstat syscall holder */
.llong .sys_ni_syscall /* old lstat syscall */
.llong .sys_readlink /* 85 */
.llong .sys_uselib
.llong .sys_swapon
......@@ -849,10 +849,10 @@ _GLOBAL(sys_call_table)
.llong .sys_newlstat
.llong .sys_newfstat
.llong .sys_uname
.llong .sys_ni_syscall /* 110 old iopl syscall holder */
.llong .sys_ni_syscall /* 110 old iopl syscall */
.llong .sys_vhangup
.llong .sys_ni_syscall /* old 'idle' syscall */
.llong .sys_ni_syscall /* old vm86 syscall holder */
.llong .sys_ni_syscall /* old idle syscall */
.llong .sys_ni_syscall /* old vm86 syscall */
.llong .sys_wait4
.llong .sys_swapoff /* 115 */
.llong .sys_sysinfo
......@@ -926,28 +926,28 @@ _GLOBAL(sys_call_table)
.llong .sys_capset
.llong .sys_sigaltstack /* 185 */
.llong .sys_sendfile
.llong .sys_ni_syscall /* streams1 */
.llong .sys_ni_syscall /* streams2 */
.llong .sys_ni_syscall /* reserved for streams1 */
.llong .sys_ni_syscall /* reserved for streams2 */
.llong .sys_vfork
.llong .sys_getrlimit /* 190 */
.llong .sys_readahead
.llong .sys_ni_syscall /* 192 - reserved - mmap2 */
.llong .sys_ni_syscall /* 193 - reserved - truncate64 */
.llong .sys_ni_syscall /* 194 - reserved - ftruncate64 */
.llong .sys_ni_syscall /* 195 - reserved - stat64 */
.llong .sys_ni_syscall /* 196 - reserved - lstat64 */
.llong .sys_ni_syscall /* 197 - reserved - fstat64 */
.llong .sys_pciconfig_read /* 198 */
.llong .sys_pciconfig_write /* 199 */
.llong .sys_ni_syscall /* 32bit only mmap2 */
.llong .sys_ni_syscall /* 32bit only truncate64 */
.llong .sys_ni_syscall /* 32bit only ftruncate64 */
.llong .sys_ni_syscall /* 195 - 32bit only stat64 */
.llong .sys_ni_syscall /* 32bit only lstat64 */
.llong .sys_ni_syscall /* 32bit only fstat64 */
.llong .sys_pciconfig_read
.llong .sys_pciconfig_write
.llong .sys_ni_syscall /* 200 - reserved - sys_pciconfig_iobase */
.llong .sys_ni_syscall /* 201 - reserved - MacOnLinux - new */
.llong .sys_getdents64 /* 202 */
.llong .sys_pivot_root /* 203 */
.llong .sys_ni_syscall /* 204 */
.llong .sys_ni_syscall /* reserved for MacOnLinux */
.llong .sys_getdents64
.llong .sys_pivot_root
.llong .sys_ni_syscall /* 32bit only fcntl64 */
.llong .sys_madvise /* 205 */
.llong .sys_mincore /* 206 */
.llong .sys_gettid /* 207 */
.llong .sys_tkill /* 208 */
.llong .sys_mincore
.llong .sys_gettid
.llong .sys_tkill
.llong .sys_setxattr
.llong .sys_lsetxattr /* 210 */
.llong .sys_fsetxattr
......@@ -965,7 +965,7 @@ _GLOBAL(sys_call_table)
.llong .sys_sched_getaffinity
.llong .sys_ni_syscall /* reserved for security */
.llong .sys_ni_syscall /* reserved for tux */
.llong .sys_ni_syscall /* reserved for sendfile64 */
.llong .sys_ni_syscall /* 225 - 32bit only sendfile64 */
.rept NR_syscalls-226
.llong .sys_ni_syscall
......
arch/ppc64/kernel/sys_ppc32.c
View file @ 8c5a83d8
......@@ -446,7 +446,6 @@ struct old_linux_dirent32 {
u32 d_ino;
u32 d_offset;
unsigned short d_namlen;
/* unsigned char d_type; */
char d_name[1];
};
......@@ -497,22 +496,12 @@ asmlinkage int old32_readdir(unsigned int fd, struct old_linux_dirent32 *dirent,
return error;
}
#if 0
struct linux_dirent32 {
u32 d_ino;
u32 d_off;
unsigned short d_reclen;
char d_name[1];
};
#else
struct linux_dirent32 {
u32 d_ino;
u32 d_off;
unsigned short d_reclen;
/* unsigned char d_type; */
char d_name[256];
};
#endif
struct getdents_callback32 {
struct linux_dirent32 * current_dir;
......@@ -539,7 +528,6 @@ filldir(void * __buf, const char * name, int namlen, off_t offset, ino_t ino,
buf->previous = dirent;
put_user(ino, &dirent->d_ino);
put_user(reclen, &dirent->d_reclen);
/* put_user(d_type, &dirent->d_type); */
copy_to_user(dirent->d_name, name, namlen);
put_user(0, dirent->d_name + namlen);
((char *) dirent) += reclen;
......
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