Commit 8568daa4 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

ppc: Use the system call table from arch/powerpc/kernel/systbl.S 



With this, new system calls only have to be wired up in one place
for ARCH=ppc and ARCH=powerpc, rather than 2.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5bc159e6

arch/powerpc/kernel/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ endif 


obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \

				   irq.o align.o signal_32.o pmc.o vdso.o \

				   init_task.o process.o

				   init_task.o process.o systbl.o

obj-y				+= vdso32/

obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \

				   signal_64.o ptrace32.o systbl.o \

				   signal_64.o ptrace32.o \

				   paca.o cpu_setup_power4.o \

				   firmware.o sysfs.o idle_64.o

obj-$(CONFIG_PPC64)		+= vdso64/
@@ -46,7 +46,7 @@ extra-$(CONFIG_8xx) := head_8xx.o 
extra-y				+= vmlinux.lds



obj-y				+= time.o prom.o traps.o setup-common.o udbg.o

obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o systbl.o

obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o

obj-$(CONFIG_PPC64)		+= misc_64.o dma_64.o iommu.o

obj-$(CONFIG_PPC_MULTIPLATFORM)	+= prom_init.o

obj-$(CONFIG_MODULES)		+= ppc_ksyms.o

arch/powerpc/kernel/systbl.S

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#ifdef CONFIG_PPC64

#define sys_sigpending	sys_ni_syscall

#define sys_old_getrlimit sys_ni_syscall

#else

#define ppc_rtas	sys_ni_syscall

#endif



_GLOBAL(sys_call_table)

arch/ppc/kernel/misc.S

+0 −283
Original line number Diff line number Diff line
@@ -1048,286 +1048,3 @@ _GLOBAL(name) \ 
	blr



SYSCALL(execve)
 


/* Why isn't this a) automatic, b) written in 'C'? */

	.data

	.align 4

_GLOBAL(sys_call_table)

	.long sys_restart_syscall /* 0 */

	.long sys_exit

	.long ppc_fork

	.long sys_read

	.long sys_write

	.long sys_open		/* 5 */

	.long sys_close

	.long sys_waitpid

	.long sys_creat

	.long sys_link

	.long sys_unlink	/* 10 */

	.long sys_execve

	.long sys_chdir

	.long sys_time

	.long sys_mknod

	.long sys_chmod		/* 15 */

	.long sys_lchown

	.long sys_ni_syscall			/* old break syscall holder */

	.long sys_stat

	.long sys_lseek

	.long sys_getpid	/* 20 */

	.long sys_mount

	.long sys_oldumount

	.long sys_setuid

	.long sys_getuid

	.long sys_stime		/* 25 */

	.long sys_ptrace

	.long sys_alarm

	.long sys_fstat

	.long sys_pause

	.long sys_utime		/* 30 */

	.long sys_ni_syscall			/* old stty syscall holder */

	.long sys_ni_syscall			/* old gtty syscall holder */

	.long sys_access

	.long sys_nice

	.long sys_ni_syscall	/* 35 */	/* old ftime syscall holder */

	.long sys_sync

	.long sys_kill

	.long sys_rename

	.long sys_mkdir

	.long sys_rmdir		/* 40 */

	.long sys_dup

	.long sys_pipe

	.long sys_times

	.long sys_ni_syscall			/* old prof syscall holder */

	.long sys_brk		/* 45 */

	.long sys_setgid

	.long sys_getgid

	.long sys_signal

	.long sys_geteuid

	.long sys_getegid	/* 50 */

	.long sys_acct

	.long sys_umount			/* recycled never used phys() */

	.long sys_ni_syscall			/* old lock syscall holder */

	.long sys_ioctl

	.long sys_fcntl		/* 55 */

	.long sys_ni_syscall			/* old mpx syscall holder */

	.long sys_setpgid

	.long sys_ni_syscall			/* old ulimit syscall holder */

	.long sys_olduname

	.long sys_umask		/* 60 */

	.long sys_chroot

	.long sys_ustat

	.long sys_dup2

	.long sys_getppid

	.long sys_getpgrp	/* 65 */

	.long sys_setsid

	.long sys_sigaction

	.long sys_sgetmask

	.long sys_ssetmask

	.long sys_setreuid	/* 70 */

	.long sys_setregid

	.long sys_sigsuspend

	.long sys_sigpending

	.long sys_sethostname

	.long sys_setrlimit	/* 75 */

	.long sys_old_getrlimit

	.long sys_getrusage

	.long sys_gettimeofday

	.long sys_settimeofday

	.long sys_getgroups	/* 80 */

	.long sys_setgroups

	.long ppc_select

	.long sys_symlink

	.long sys_lstat

	.long sys_readlink	/* 85 */

	.long sys_uselib

	.long sys_swapon

	.long sys_reboot

	.long old_readdir

	.long sys_mmap		/* 90 */

	.long sys_munmap

	.long sys_truncate

	.long sys_ftruncate

	.long sys_fchmod

	.long sys_fchown	/* 95 */

	.long sys_getpriority

	.long sys_setpriority

	.long sys_ni_syscall			/* old profil syscall holder */

	.long sys_statfs

	.long sys_fstatfs	/* 100 */

	.long sys_ni_syscall

	.long sys_socketcall

	.long sys_syslog

	.long sys_setitimer

	.long sys_getitimer	/* 105 */

	.long sys_newstat

	.long sys_newlstat

	.long sys_newfstat

	.long sys_uname

	.long sys_ni_syscall	/* 110 */

	.long sys_vhangup

	.long sys_ni_syscall	/* old 'idle' syscall */

	.long sys_ni_syscall

	.long sys_wait4

	.long sys_swapoff	/* 115 */

	.long sys_sysinfo

	.long sys_ipc

	.long sys_fsync

	.long sys_sigreturn

	.long ppc_clone		/* 120 */

	.long sys_setdomainname

	.long sys_newuname

	.long sys_ni_syscall

	.long sys_adjtimex

	.long sys_mprotect	/* 125 */

	.long sys_sigprocmask

	.long sys_ni_syscall	/* old sys_create_module */

	.long sys_init_module

	.long sys_delete_module

	.long sys_ni_syscall	/* old sys_get_kernel_syms */	/* 130 */

	.long sys_quotactl

	.long sys_getpgid

	.long sys_fchdir

	.long sys_bdflush

	.long sys_sysfs		/* 135 */

	.long sys_personality

	.long sys_ni_syscall	/* for afs_syscall */

	.long sys_setfsuid

	.long sys_setfsgid

	.long sys_llseek	/* 140 */

	.long sys_getdents

	.long ppc_select

	.long sys_flock

	.long sys_msync

	.long sys_readv		/* 145 */

	.long sys_writev

	.long sys_getsid

	.long sys_fdatasync

	.long sys_sysctl

	.long sys_mlock		/* 150 */

	.long sys_munlock

	.long sys_mlockall

	.long sys_munlockall

	.long sys_sched_setparam

	.long sys_sched_getparam	/* 155 */

	.long sys_sched_setscheduler

	.long sys_sched_getscheduler

	.long sys_sched_yield

	.long sys_sched_get_priority_max

	.long sys_sched_get_priority_min  /* 160 */

	.long sys_sched_rr_get_interval

	.long sys_nanosleep

	.long sys_mremap

	.long sys_setresuid

	.long sys_getresuid	/* 165 */

	.long sys_ni_syscall		/* old sys_query_module */

	.long sys_poll

	.long sys_nfsservctl

	.long sys_setresgid

	.long sys_getresgid	/* 170 */

	.long sys_prctl

	.long sys_rt_sigreturn

	.long sys_rt_sigaction

	.long sys_rt_sigprocmask

	.long sys_rt_sigpending	/* 175 */

	.long sys_rt_sigtimedwait

	.long sys_rt_sigqueueinfo

	.long sys_rt_sigsuspend

	.long sys_pread64

	.long sys_pwrite64	/* 180 */

	.long sys_chown

	.long sys_getcwd

	.long sys_capget

	.long sys_capset

	.long sys_sigaltstack	/* 185 */

	.long sys_sendfile

	.long sys_ni_syscall		/* streams1 */

	.long sys_ni_syscall		/* streams2 */

	.long ppc_vfork

	.long sys_getrlimit	/* 190 */

	.long sys_readahead

	.long sys_mmap2

	.long sys_truncate64

	.long sys_ftruncate64

	.long sys_stat64	/* 195 */

	.long sys_lstat64

	.long sys_fstat64

	.long sys_pciconfig_read

	.long sys_pciconfig_write

	.long sys_pciconfig_iobase 	/* 200 */

	.long sys_ni_syscall		/* 201 - reserved - MacOnLinux - new */

	.long sys_getdents64

	.long sys_pivot_root

	.long sys_fcntl64

	.long sys_madvise	/* 205 */

	.long sys_mincore

	.long sys_gettid

	.long sys_tkill

	.long sys_setxattr

	.long sys_lsetxattr	/* 210 */

	.long sys_fsetxattr

	.long sys_getxattr

	.long sys_lgetxattr

	.long sys_fgetxattr

	.long sys_listxattr	/* 215 */

	.long sys_llistxattr

	.long sys_flistxattr

	.long sys_removexattr

	.long sys_lremovexattr

	.long sys_fremovexattr	/* 220 */

	.long sys_futex

	.long sys_sched_setaffinity

	.long sys_sched_getaffinity

	.long sys_ni_syscall

	.long sys_ni_syscall	/* 225 - reserved for Tux */

	.long sys_sendfile64

	.long sys_io_setup

	.long sys_io_destroy

	.long sys_io_getevents

	.long sys_io_submit	/* 230 */

	.long sys_io_cancel

	.long sys_set_tid_address

	.long sys_fadvise64

	.long sys_exit_group

	.long sys_lookup_dcookie /* 235 */

	.long sys_epoll_create

	.long sys_epoll_ctl

	.long sys_epoll_wait

	.long sys_remap_file_pages

	.long sys_timer_create	/* 240 */

	.long sys_timer_settime

	.long sys_timer_gettime

	.long sys_timer_getoverrun

	.long sys_timer_delete

	.long sys_clock_settime	/* 245 */

	.long sys_clock_gettime

	.long sys_clock_getres

	.long sys_clock_nanosleep

	.long sys_swapcontext

	.long sys_tgkill	/* 250 */

	.long sys_utimes

	.long sys_statfs64

	.long sys_fstatfs64

	.long ppc_fadvise64_64

	.long sys_ni_syscall		/* 255 - rtas (used on ppc64) */

	.long sys_debug_setcontext

	.long sys_ni_syscall		/* 257 reserved for vserver */

	.long sys_ni_syscall		/* 258 reserved for new sys_remap_file_pages */

	.long sys_ni_syscall		/* 259 reserved for new sys_mbind */

	.long sys_ni_syscall		/* 260 reserved for new sys_get_mempolicy */

	.long sys_ni_syscall		/* 261 reserved for new sys_set_mempolicy */

	.long sys_mq_open

	.long sys_mq_unlink

	.long sys_mq_timedsend

	.long sys_mq_timedreceive	/* 265 */

	.long sys_mq_notify

	.long sys_mq_getsetattr

	.long sys_kexec_load

	.long sys_add_key

	.long sys_request_key		/* 270 */

	.long sys_keyctl

	.long sys_waitid

	.long sys_ioprio_set

	.long sys_ioprio_get

	.long sys_inotify_init		/* 275 */

	.long sys_inotify_add_watch

	.long sys_inotify_rm_watch