joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-11-24 04:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] xtensa: remove old syscalls

Browse Source 
This patch fixes some minor bugs introduced by the previous patch (remove
old syscalls).  Both patches remove the obsolete syscalls.  The changes in
this patch were suggested by Arnd Bergmann.  The vmlinux.lds.S changes are
required for the latest gcc/binutils.

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Chris Zankel 2005-07-12 13:58:25 -07:00 committed by Linus Torvalds
parent c40504e87e
commit 813e678364
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/xtensa/kernel/asm-offsets.c
View File

@ -15,7 +15,6 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/sched.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/thread_info.h> #include <linux/thread_info.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>

4
arch/xtensa/kernel/syscalls.c
View File

@ -69,8 +69,8 @@ int sys_pipe(int __user *userfds)
/* /*
* Common code for old and new mmaps. * Common code for old and new mmaps.
*/ */
long sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot, long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
unsigned long flags, unsigned long fd, unsigned long pgoff) unsigned long flags, unsigned long fd, unsigned long pgoff)
{ {
int error = -EBADF; int error = -EBADF;
struct file * file = NULL; struct file * file = NULL;

6
arch/xtensa/kernel/syscalls.h
View File

@ -42,7 +42,7 @@ SYSCALL(sys_mknod, 3)
SYSCALL(sys_chmod, 2) /* 15 */ SYSCALL(sys_chmod, 2) /* 15 */
SYSCALL(sys_lchown, 3) SYSCALL(sys_lchown, 3)
SYSCALL(sys_ni_syscall, 0) SYSCALL(sys_ni_syscall, 0)
SYSCALL(sys_stat, 2) SYSCALL(sys_newstat, 2)
SYSCALL(sys_lseek, 3) SYSCALL(sys_lseek, 3)
SYSCALL(sys_getpid, 0) /* 20 */ SYSCALL(sys_getpid, 0) /* 20 */
SYSCALL(sys_mount, 5) SYSCALL(sys_mount, 5)
@ -52,7 +52,7 @@ SYSCALL(sys_getuid, 0)
SYSCALL(sys_ni_syscall, 1) /* 25 */ SYSCALL(sys_ni_syscall, 1) /* 25 */
SYSCALL(sys_ptrace, 4) SYSCALL(sys_ptrace, 4)
SYSCALL(sys_ni_syscall, 1) SYSCALL(sys_ni_syscall, 1)
SYSCALL(sys_fstat, 2) SYSCALL(sys_newfstat, 2)
SYSCALL(sys_ni_syscall, 0) SYSCALL(sys_ni_syscall, 0)
SYSCALL(sys_utime, 2) /* 30 */ SYSCALL(sys_utime, 2) /* 30 */
SYSCALL(sys_ni_syscall, 0) SYSCALL(sys_ni_syscall, 0)
@ -108,7 +108,7 @@ SYSCALL(sys_getgroups, 2) /* 80 */
SYSCALL(sys_setgroups, 2) SYSCALL(sys_setgroups, 2)
SYSCALL(sys_ni_syscall, 0) SYSCALL(sys_ni_syscall, 0)
SYSCALL(sys_symlink, 2) SYSCALL(sys_symlink, 2)
SYSCALL(sys_lstat, 2) SYSCALL(sys_newlstat, 2)
SYSCALL(sys_readlink, 3) /* 85 */ SYSCALL(sys_readlink, 3) /* 85 */
SYSCALL(sys_uselib, 1) SYSCALL(sys_uselib, 1)
SYSCALL(sys_swapon, 2) SYSCALL(sys_swapon, 2)

6
arch/xtensa/kernel/vmlinux.lds.S
View File

@ -90,10 +90,10 @@ SECTIONS
*(.literal .text) *(.literal .text)
*(.srom.text) *(.srom.text)
VMLINUX_SYMBOL(__sched_text_start) = .; VMLINUX_SYMBOL(__sched_text_start) = .;
*(.sched.text.literal .sched.text) *(.sched.literal .sched.text)
VMLINUX_SYMBOL(__sched_text_end) = .; VMLINUX_SYMBOL(__sched_text_end) = .;
VMLINUX_SYMBOL(__lock_text_start) = .; VMLINUX_SYMBOL(__lock_text_start) = .;
*(.spinlock.text.literal .spinlock.text) *(.spinlock.literal .spinlock.text)
VMLINUX_SYMBOL(__lock_text_end) = .; VMLINUX_SYMBOL(__lock_text_end) = .;
} }
@ -164,7 +164,7 @@ SECTIONS
__init_begin = .; __init_begin = .;
.init.text : { .init.text : {
_sinittext = .; _sinittext = .;
*(.init.text.literal) *(.init.text) *(.init.literal) *(.init.text)
_einittext = .; _einittext = .;
} }

2
ipc/util.h
View File

@ -67,7 +67,7 @@ int ipc_checkid(struct ipc_ids* ids, struct kern_ipc_perm* ipcp, int uid);
void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out);
void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out); void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out);
#if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__) #if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__) || defined(__XTENSA__)
/* On IA-64, we always use the "64-bit version" of the IPC structures. */ /* On IA-64, we always use the "64-bit version" of the IPC structures. */
# define ipc_parse_version(cmd) IPC_64 # define ipc_parse_version(cmd) IPC_64
#else #else