Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 813e6783 authored by Chris Zankel's avatar Chris Zankel Committed by Linus Torvalds
Browse files

[PATCH] xtensa: remove old syscalls 



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: default avatarChris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c40504e8

arch/xtensa/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <asm/processor.h>



#include <linux/types.h>

#include <linux/sched.h>

#include <linux/stddef.h>

#include <linux/thread_info.h>

#include <linux/ptrace.h>

arch/xtensa/kernel/syscalls.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ int sys_pipe(int __user *userfds) 
/*

 * 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)

{

	int error = -EBADF;

arch/xtensa/kernel/syscalls.h

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ SYSCALL(sys_mknod, 3) 
SYSCALL(sys_chmod, 2)			/* 15 */

SYSCALL(sys_lchown, 3)

SYSCALL(sys_ni_syscall, 0)

SYSCALL(sys_stat, 2)

SYSCALL(sys_newstat, 2)

SYSCALL(sys_lseek, 3)

SYSCALL(sys_getpid, 0)			/* 20 */

SYSCALL(sys_mount, 5)
@@ -52,7 +52,7 @@ SYSCALL(sys_getuid, 0) 
SYSCALL(sys_ni_syscall, 1)		/* 25 */

SYSCALL(sys_ptrace, 4)

SYSCALL(sys_ni_syscall, 1)

SYSCALL(sys_fstat, 2)

SYSCALL(sys_newfstat, 2)

SYSCALL(sys_ni_syscall, 0)

SYSCALL(sys_utime, 2)			/* 30 */

SYSCALL(sys_ni_syscall, 0)
@@ -108,7 +108,7 @@ SYSCALL(sys_getgroups, 2) /* 80 */ 
SYSCALL(sys_setgroups, 2)

SYSCALL(sys_ni_syscall, 0)

SYSCALL(sys_symlink, 2)

SYSCALL(sys_lstat, 2)

SYSCALL(sys_newlstat, 2)

SYSCALL(sys_readlink, 3)		/* 85 */

SYSCALL(sys_uselib, 1)

SYSCALL(sys_swapon, 2)

arch/xtensa/kernel/vmlinux.lds.S

+3 −3
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@ SECTIONS 
    *(.literal .text)

    *(.srom.text)

    VMLINUX_SYMBOL(__sched_text_start) = .;

    *(.sched.text.literal .sched.text)

    *(.sched.literal .sched.text)

    VMLINUX_SYMBOL(__sched_text_end) = .;

    VMLINUX_SYMBOL(__lock_text_start) = .;

    *(.spinlock.text.literal .spinlock.text)

    *(.spinlock.literal .spinlock.text)

    VMLINUX_SYMBOL(__lock_text_end) = .;



  }
@@ -164,7 +164,7 @@ SECTIONS 
  __init_begin = .;

  .init.text : {

  	_sinittext = .;

	*(.init.text.literal) *(.init.text)

	*(.init.literal) *(.init.text)

	_einittext = .;

  }

ipc/util.h

+1 −1
Original line number Diff line number Diff line
@@ -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 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.  */ 

# define ipc_parse_version(cmd)	IPC_64

#else