[PATCH] uml: fix syscall table by including $(SUBARCH)'s one, for i386

Split the i386 entry.S files into entry.S and syscall_table.S which is included in the previous one (so actually there is no difference between them) and use the syscall_table.S in the UML build, instead of tracking by hand the syscall table changes (which is inherently error-prone). We must only insert the right #defines to inject the changes we need from the i386 syscall table (for instance some different function names); also, we don't implement some i386 syscalls, as ioperm(), nor some TLS-related ones (yet to provide). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> 2005-05-01 11:58:55 -0400
committer: Linus Torvalds <torvalds@ppc970.osdl.org> 2005-05-01 11:58:55 -0400
commit: 5e7b83ffc67e15791d9bf8b2a18e4f5fd0eb69b8 (patch)
tree: 21d245a8ebe9a36748b1f76ff9050ceeaeba926c /arch/i386/kernel/entry.S
parent: e9c527163d31da9f616e989a90429729525c5233 (diff)
1 files changed, 1 insertions, 291 deletions
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index 25bf7589e0c4..a991d4e5edd2 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -652,296 +652,6 @@ ENTRY(spurious_interrupt_bug)
        pushl $do_spurious_interrupt_bug
        jmp error_code
-.data
+#include "syscall_table.S"
-ENTRY(sys_call_table)
-        .long sys_restart_syscall       /* 0 - old "setup()" system call, used for restarting */
-        .long sys_exit
-        .long sys_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_lchown16
-        .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_setuid16
-        .long sys_getuid16
-        .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_setgid16
-        .long sys_getgid16
-        .long sys_signal
-        .long sys_geteuid16
-        .long sys_getegid16     /* 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_setreuid16    /* 70 */
-        .long sys_setregid16
-        .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_getgroups16   /* 80 */
-        .long sys_setgroups16
-        .long old_select
-        .long sys_symlink
-        .long sys_lstat
-        .long sys_readlink      /* 85 */
-        .long sys_uselib
-        .long sys_swapon
-        .long sys_reboot
-        .long old_readdir
-        .long old_mmap          /* 90 */
-        .long sys_munmap
-        .long sys_truncate
-        .long sys_ftruncate
-        .long sys_fchmod
-        .long sys_fchown16      /* 95 */
-        .long sys_getpriority
-        .long sys_setpriority
-        .long sys_ni_syscall    /* old profil syscall holder */
-        .long sys_statfs
-        .long sys_fstatfs       /* 100 */
-        .long sys_ioperm
-        .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_iopl          /* 110 */
-        .long sys_vhangup
-        .long sys_ni_syscall    /* old "idle" system call */
-        .long sys_vm86old
-        .long sys_wait4
-        .long sys_swapoff       /* 115 */
-        .long sys_sysinfo
-        .long sys_ipc
-        .long sys_fsync
-        .long sys_sigreturn
-        .long sys_clone         /* 120 */
-        .long sys_setdomainname
-        .long sys_newuname
-        .long sys_modify_ldt
-        .long sys_adjtimex
-        .long sys_mprotect      /* 125 */
-        .long sys_sigprocmask
-        .long sys_ni_syscall    /* old "create_module" */ 
-        .long sys_init_module
-        .long sys_delete_module
-        .long sys_ni_syscall    /* 130: old "get_kernel_syms" */
-        .long sys_quotactl
-        .long sys_getpgid
-        .long sys_fchdir
-        .long sys_bdflush
-        .long sys_sysfs         /* 135 */
-        .long sys_personality
-        .long sys_ni_syscall    /* reserved for afs_syscall */
-        .long sys_setfsuid16
-        .long sys_setfsgid16
-        .long sys_llseek        /* 140 */
-        .long sys_getdents
-        .long sys_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_setresuid16
-        .long sys_getresuid16   /* 165 */
-        .long sys_vm86
-        .long sys_ni_syscall    /* Old sys_query_module */
-        .long sys_poll
-        .long sys_nfsservctl
-        .long sys_setresgid16   /* 170 */
-        .long sys_getresgid16
-        .long sys_prctl
-        .long sys_rt_sigreturn
-        .long sys_rt_sigaction
-        .long sys_rt_sigprocmask        /* 175 */
-        .long sys_rt_sigpending
-        .long sys_rt_sigtimedwait
-        .long sys_rt_sigqueueinfo
-        .long sys_rt_sigsuspend
-        .long sys_pread64       /* 180 */
-        .long sys_pwrite64
-        .long sys_chown16
-        .long sys_getcwd
-        .long sys_capget
-        .long sys_capset        /* 185 */
-        .long sys_sigaltstack
-        .long sys_sendfile
-        .long sys_ni_syscall    /* reserved for streams1 */
-        .long sys_ni_syscall    /* reserved for streams2 */
-        .long sys_vfork         /* 190 */
-        .long sys_getrlimit
-        .long sys_mmap2
-        .long sys_truncate64
-        .long sys_ftruncate64
-        .long sys_stat64        /* 195 */
-        .long sys_lstat64
-        .long sys_fstat64
-        .long sys_lchown
-        .long sys_getuid
-        .long sys_getgid        /* 200 */
-        .long sys_geteuid
-        .long sys_getegid
-        .long sys_setreuid
-        .long sys_setregid
-        .long sys_getgroups     /* 205 */
-        .long sys_setgroups
-        .long sys_fchown
-        .long sys_setresuid
-        .long sys_getresuid
-        .long sys_setresgid     /* 210 */
-        .long sys_getresgid
-        .long sys_chown
-        .long sys_setuid
-        .long sys_setgid
-        .long sys_setfsuid      /* 215 */
-        .long sys_setfsgid
-        .long sys_pivot_root
-        .long sys_mincore
-        .long sys_madvise
-        .long sys_getdents64    /* 220 */
-        .long sys_fcntl64
-        .long sys_ni_syscall    /* reserved for TUX */
-        .long sys_ni_syscall
-        .long sys_gettid
-        .long sys_readahead     /* 225 */
-        .long sys_setxattr
-        .long sys_lsetxattr
-        .long sys_fsetxattr
-        .long sys_getxattr
-        .long sys_lgetxattr     /* 230 */
-        .long sys_fgetxattr
-        .long sys_listxattr
-        .long sys_llistxattr
-        .long sys_flistxattr
-        .long sys_removexattr   /* 235 */
-        .long sys_lremovexattr
-        .long sys_fremovexattr
-        .long sys_tkill
-        .long sys_sendfile64
-        .long sys_futex         /* 240 */
-        .long sys_sched_setaffinity
-        .long sys_sched_getaffinity
-        .long sys_set_thread_area
-        .long sys_get_thread_area
-        .long sys_io_setup      /* 245 */
-        .long sys_io_destroy
-        .long sys_io_getevents
-        .long sys_io_submit
-        .long sys_io_cancel
-        .long sys_fadvise64     /* 250 */
-        .long sys_ni_syscall
-        .long sys_exit_group
-        .long sys_lookup_dcookie
-        .long sys_epoll_create
-        .long sys_epoll_ctl     /* 255 */
-        .long sys_epoll_wait
-        .long sys_remap_file_pages
-        .long sys_set_tid_address
-        .long sys_timer_create
-        .long sys_timer_settime         /* 260 */
-        .long sys_timer_gettime
-        .long sys_timer_getoverrun
-        .long sys_timer_delete
-        .long sys_clock_settime
-        .long sys_clock_gettime         /* 265 */
-        .long sys_clock_getres
-        .long sys_clock_nanosleep
-        .long sys_statfs64
-        .long sys_fstatfs64     
-        .long sys_tgkill        /* 270 */
-        .long sys_utimes
-        .long sys_fadvise64_64
-        .long sys_ni_syscall    /* sys_vserver */
-        .long sys_mbind
-        .long sys_get_mempolicy
-        .long sys_set_mempolicy
-        .long sys_mq_open
-        .long sys_mq_unlink
-        .long sys_mq_timedsend
-        .long sys_mq_timedreceive       /* 280 */
-        .long sys_mq_notify
-        .long sys_mq_getsetattr
-        .long sys_ni_syscall            /* reserved for kexec */
-        .long sys_waitid
-        .long sys_ni_syscall            /* 285 */ /* available */
-        .long sys_add_key
-        .long sys_request_key
-        .long sys_keyctl
 syscall_table_size=(.-sys_call_table)
author	Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>	2005-05-01 11:58:55 -0400
committer	Linus Torvalds <torvalds@ppc970.osdl.org>	2005-05-01 11:58:55 -0400
commit	5e7b83ffc67e15791d9bf8b2a18e4f5fd0eb69b8 (patch)
tree	21d245a8ebe9a36748b1f76ff9050ceeaeba926c /arch/i386/kernel/entry.S
parent	e9c527163d31da9f616e989a90429729525c5233 (diff)

diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index 25bf7589e0c4..a991d4e5edd2 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S
@@ -652,296 +652,6 @@ ENTRY(spurious_interrupt_bug)
652	pushl $do_spurious_interrupt_bug	652	pushl $do_spurious_interrupt_bug
653	jmp error_code	653	jmp error_code
654		654
655	.data	655	#include "syscall_table.S"
656	ENTRY(sys_call_table)
657	.long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
658	.long sys_exit
659	.long sys_fork
660	.long sys_read
661	.long sys_write
662	.long sys_open /* 5 */
663	.long sys_close
664	.long sys_waitpid
665	.long sys_creat
666	.long sys_link
667	.long sys_unlink /* 10 */
668	.long sys_execve
669	.long sys_chdir
670	.long sys_time
671	.long sys_mknod
672	.long sys_chmod /* 15 */
673	.long sys_lchown16
674	.long sys_ni_syscall /* old break syscall holder */
675	.long sys_stat
676	.long sys_lseek
677	.long sys_getpid /* 20 */
678	.long sys_mount
679	.long sys_oldumount
680	.long sys_setuid16
681	.long sys_getuid16
682	.long sys_stime /* 25 */
683	.long sys_ptrace
684	.long sys_alarm
685	.long sys_fstat
686	.long sys_pause
687	.long sys_utime /* 30 */
688	.long sys_ni_syscall /* old stty syscall holder */
689	.long sys_ni_syscall /* old gtty syscall holder */
690	.long sys_access
691	.long sys_nice
692	.long sys_ni_syscall /* 35 - old ftime syscall holder */
693	.long sys_sync
694	.long sys_kill
695	.long sys_rename
696	.long sys_mkdir
697	.long sys_rmdir /* 40 */
698	.long sys_dup
699	.long sys_pipe
700	.long sys_times
701	.long sys_ni_syscall /* old prof syscall holder */
702	.long sys_brk /* 45 */
703	.long sys_setgid16
704	.long sys_getgid16
705	.long sys_signal
706	.long sys_geteuid16
707	.long sys_getegid16 /* 50 */
708	.long sys_acct
709	.long sys_umount /* recycled never used phys() */
710	.long sys_ni_syscall /* old lock syscall holder */
711	.long sys_ioctl
712	.long sys_fcntl /* 55 */
713	.long sys_ni_syscall /* old mpx syscall holder */
714	.long sys_setpgid
715	.long sys_ni_syscall /* old ulimit syscall holder */
716	.long sys_olduname
717	.long sys_umask /* 60 */
718	.long sys_chroot
719	.long sys_ustat
720	.long sys_dup2
721	.long sys_getppid
722	.long sys_getpgrp /* 65 */
723	.long sys_setsid
724	.long sys_sigaction
725	.long sys_sgetmask
726	.long sys_ssetmask
727	.long sys_setreuid16 /* 70 */
728	.long sys_setregid16
729	.long sys_sigsuspend
730	.long sys_sigpending
731	.long sys_sethostname
732	.long sys_setrlimit /* 75 */
733	.long sys_old_getrlimit
734	.long sys_getrusage
735	.long sys_gettimeofday
736	.long sys_settimeofday
737	.long sys_getgroups16 /* 80 */
738	.long sys_setgroups16
739	.long old_select
740	.long sys_symlink
741	.long sys_lstat
742	.long sys_readlink /* 85 */
743	.long sys_uselib
744	.long sys_swapon
745	.long sys_reboot
746	.long old_readdir
747	.long old_mmap /* 90 */
748	.long sys_munmap
749	.long sys_truncate
750	.long sys_ftruncate
751	.long sys_fchmod
752	.long sys_fchown16 /* 95 */
753	.long sys_getpriority
754	.long sys_setpriority
755	.long sys_ni_syscall /* old profil syscall holder */
756	.long sys_statfs
757	.long sys_fstatfs /* 100 */
758	.long sys_ioperm
759	.long sys_socketcall
760	.long sys_syslog
761	.long sys_setitimer
762	.long sys_getitimer /* 105 */
763	.long sys_newstat
764	.long sys_newlstat
765	.long sys_newfstat
766	.long sys_uname
767	.long sys_iopl /* 110 */
768	.long sys_vhangup
769	.long sys_ni_syscall /* old "idle" system call */
770	.long sys_vm86old
771	.long sys_wait4
772	.long sys_swapoff /* 115 */
773	.long sys_sysinfo
774	.long sys_ipc
775	.long sys_fsync
776	.long sys_sigreturn
777	.long sys_clone /* 120 */
778	.long sys_setdomainname
779	.long sys_newuname
780	.long sys_modify_ldt
781	.long sys_adjtimex
782	.long sys_mprotect /* 125 */
783	.long sys_sigprocmask
784	.long sys_ni_syscall /* old "create_module" */
785	.long sys_init_module
786	.long sys_delete_module
787	.long sys_ni_syscall /* 130: old "get_kernel_syms" */
788	.long sys_quotactl
789	.long sys_getpgid
790	.long sys_fchdir
791	.long sys_bdflush
792	.long sys_sysfs /* 135 */
793	.long sys_personality
794	.long sys_ni_syscall /* reserved for afs_syscall */
795	.long sys_setfsuid16
796	.long sys_setfsgid16
797	.long sys_llseek /* 140 */
798	.long sys_getdents
799	.long sys_select
800	.long sys_flock
801	.long sys_msync
802	.long sys_readv /* 145 */
803	.long sys_writev
804	.long sys_getsid
805	.long sys_fdatasync
806	.long sys_sysctl
807	.long sys_mlock /* 150 */
808	.long sys_munlock
809	.long sys_mlockall
810	.long sys_munlockall
811	.long sys_sched_setparam
812	.long sys_sched_getparam /* 155 */
813	.long sys_sched_setscheduler
814	.long sys_sched_getscheduler
815	.long sys_sched_yield
816	.long sys_sched_get_priority_max
817	.long sys_sched_get_priority_min /* 160 */
818	.long sys_sched_rr_get_interval
819	.long sys_nanosleep
820	.long sys_mremap
821	.long sys_setresuid16
822	.long sys_getresuid16 /* 165 */
823	.long sys_vm86
824	.long sys_ni_syscall /* Old sys_query_module */
825	.long sys_poll
826	.long sys_nfsservctl
827	.long sys_setresgid16 /* 170 */
828	.long sys_getresgid16
829	.long sys_prctl
830	.long sys_rt_sigreturn
831	.long sys_rt_sigaction
832	.long sys_rt_sigprocmask /* 175 */
833	.long sys_rt_sigpending
834	.long sys_rt_sigtimedwait
835	.long sys_rt_sigqueueinfo
836	.long sys_rt_sigsuspend
837	.long sys_pread64 /* 180 */
838	.long sys_pwrite64
839	.long sys_chown16
840	.long sys_getcwd
841	.long sys_capget
842	.long sys_capset /* 185 */
843	.long sys_sigaltstack
844	.long sys_sendfile
845	.long sys_ni_syscall /* reserved for streams1 */
846	.long sys_ni_syscall /* reserved for streams2 */
847	.long sys_vfork /* 190 */
848	.long sys_getrlimit
849	.long sys_mmap2
850	.long sys_truncate64
851	.long sys_ftruncate64
852	.long sys_stat64 /* 195 */
853	.long sys_lstat64
854	.long sys_fstat64
855	.long sys_lchown
856	.long sys_getuid
857	.long sys_getgid /* 200 */
858	.long sys_geteuid
859	.long sys_getegid
860	.long sys_setreuid
861	.long sys_setregid
862	.long sys_getgroups /* 205 */
863	.long sys_setgroups
864	.long sys_fchown
865	.long sys_setresuid
866	.long sys_getresuid
867	.long sys_setresgid /* 210 */
868	.long sys_getresgid
869	.long sys_chown
870	.long sys_setuid
871	.long sys_setgid
872	.long sys_setfsuid /* 215 */
873	.long sys_setfsgid
874	.long sys_pivot_root
875	.long sys_mincore
876	.long sys_madvise
877	.long sys_getdents64 /* 220 */
878	.long sys_fcntl64
879	.long sys_ni_syscall /* reserved for TUX */
880	.long sys_ni_syscall
881	.long sys_gettid
882	.long sys_readahead /* 225 */
883	.long sys_setxattr
884	.long sys_lsetxattr
885	.long sys_fsetxattr
886	.long sys_getxattr
887	.long sys_lgetxattr /* 230 */
888	.long sys_fgetxattr
889	.long sys_listxattr
890	.long sys_llistxattr
891	.long sys_flistxattr
892	.long sys_removexattr /* 235 */
893	.long sys_lremovexattr
894	.long sys_fremovexattr
895	.long sys_tkill
896	.long sys_sendfile64
897	.long sys_futex /* 240 */
898	.long sys_sched_setaffinity
899	.long sys_sched_getaffinity
900	.long sys_set_thread_area
901	.long sys_get_thread_area
902	.long sys_io_setup /* 245 */
903	.long sys_io_destroy
904	.long sys_io_getevents
905	.long sys_io_submit
906	.long sys_io_cancel
907	.long sys_fadvise64 /* 250 */
908	.long sys_ni_syscall
909	.long sys_exit_group
910	.long sys_lookup_dcookie
911	.long sys_epoll_create
912	.long sys_epoll_ctl /* 255 */
913	.long sys_epoll_wait
914	.long sys_remap_file_pages
915	.long sys_set_tid_address
916	.long sys_timer_create
917	.long sys_timer_settime /* 260 */
918	.long sys_timer_gettime
919	.long sys_timer_getoverrun
920	.long sys_timer_delete
921	.long sys_clock_settime
922	.long sys_clock_gettime /* 265 */
923	.long sys_clock_getres
924	.long sys_clock_nanosleep
925	.long sys_statfs64
926	.long sys_fstatfs64
927	.long sys_tgkill /* 270 */
928	.long sys_utimes
929	.long sys_fadvise64_64
930	.long sys_ni_syscall /* sys_vserver */
931	.long sys_mbind
932	.long sys_get_mempolicy
933	.long sys_set_mempolicy
934	.long sys_mq_open
935	.long sys_mq_unlink
936	.long sys_mq_timedsend
937	.long sys_mq_timedreceive /* 280 */
938	.long sys_mq_notify
939	.long sys_mq_getsetattr
940	.long sys_ni_syscall /* reserved for kexec */
941	.long sys_waitid
942	.long sys_ni_syscall /* 285 / / available */
943	.long sys_add_key
944	.long sys_request_key
945	.long sys_keyctl
946		656
947	syscall_table_size=(.-sys_call_table)	657	syscall_table_size=(.-sys_call_table)