[CRIU] [PATCH 1/2] x86: syscalls -- Fix typos in 32 bit

[Pavel Emelyanov]

On 04/13/2015 11:10 PM, Cyrill Gorcunov wrote:

Is this for "[PATCH 3/3] arch: x86-32 syscalls -- Wire in syscalls generation"?
If yes, better re-send the original patch v2.

-- Pavel

> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---
>  arch/x86/Makefile                |  4 ++--
>  arch/x86/syscalls/syscall_32.tbl | 10 +++++-----
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> index a21e68846814..6f7eb132168d 100644
> --- a/arch/x86/Makefile
> +++ b/arch/x86/Makefile
> @@ -53,8 +53,8 @@ $(obj)/$(SYS-PROTO): $(obj)/syscalls/$(SYS-DEF)
>  	$(Q) echo "#define __ASM_CR_SYSCALL_PROTO_H__"							>> $@
>  	$(Q) echo "#include \"syscall-codes.h\""							>> $@
>  	$(Q) echo "#include \"syscall-types.h\""							>> $@
> -ifeq ($(ARCH),i386)
> -	$(Q) echo "#include \"asm/syscall32-proto.h\""							>> $@
> +ifneq ($(ARCH),x86_64)
> +	$(Q) echo "#include \"asm/syscall32.h\""							>> $@
>  endif
>  	$(Q) cat $< | awk  '/^__NR/{print "extern long", $$3, substr($$0, index($$0,$$4)), ";"}'	>> $@
>  	$(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */"						>> $@
> diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
> index 99833465c6b7..0e06607747a3 100644
> --- a/arch/x86/syscalls/syscall_32.tbl
> +++ b/arch/x86/syscalls/syscall_32.tbl
> @@ -29,7 +29,7 @@ __NR_setpriority	97		sys_setpriority		(int which, int who, int nice)
>  __NR_socketcall		102		sys_socketcall		(int call, unsigned long *args)
>  __NR_setitimer		104		sys_setitimer		(int which, struct itimerval *in, struct itimerval *out)
>  __NR_getitimer		105		sys_getitimer		(int which, struct itimerval *it)
> -__NR_wait4		114		sys_wait4		(pid_t pid, unsigned int *stat_addr, int options, struct rusage *ru)
> +__NR_wait4		114		sys_wait4		(pid_t pid, int *stat_addr, int options, struct rusage *ru)
>  __NR_ipc		117		sys_ipc			(unsigned int call, int first, unsigned long second, unsigned long third, void *ptr, long fifth)
>  __NR_clone		120		sys_clone		(unsigned long flags, void *child_stack, void *parent_tid, void *child_tid)
>  __NR_mprotect		125		sys_mprotect		(const void *addr, unsigned long len, unsigned long prot)
> @@ -63,18 +63,18 @@ __NR_gettid		224		sys_gettid		(void)
>  __NR_futex		240		sys_futex		(u32 *uaddr, int op, u32 val, struct timespec *utime, u32 *uaddr2, u32 val3)
>  __NR_set_thread_area	243		sys_set_thread_area	(user_desc_t *info)
>  __NR_get_thread_area	244		sys_get_thread_area	(user_desc_t *info)
> -__NR_io_setup		245		sys_io_setup		(unsigned nr_reqs, u32 *ctx32p)
> +__NR_io_setup		245		sys_io_setup		(unsigned nr_reqs, aio_context_t *ctx32p)
>  __NR_io_getevents	247		sys_io_getevents	(aio_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout)
>  __NR_exit_group		252		sys_exit_group		(int error_code)
>  __NR_set_tid_address	258		sys_set_tid_address	(int *tid_addr)
>  __NR_timer_create	259		sys_timer_create	(clockid_t which_clock, struct sigevent *timer_event_spec, timer_t *created_timer_id)
> -__NR_timer_settime	260		sys_timer_settime	(int timer_id, int flags, struct itimerspec *new, struct itimerspec *old)
> +__NR_timer_settime	260		sys_timer_settime	(timer_t timer_id, int flags, struct itimerspec *new, struct itimerspec *old)
>  __NR_timer_gettime	261		sys_timer_gettime	(int timer_id, struct itimerspec *setting)
>  __NR_timer_getoverrun	262		sys_timer_getoverrun	(int timer_id)
> -__NR_timer_delete	263		sys_timer_delete	(int timer_id)
> +__NR_timer_delete	263		sys_timer_delete	(timer_t timer_id)
>  __NR_clock_gettime	265		sys_clock_gettime	(int which_clock, struct timespec *tp)
>  __NR_set_robust_list	311		sys_set_robust_list	(struct robust_list_head *head, size_t len)
> -__NR_get_robust_list	312		sys_get_robust_list	(int pid, struct robust_list_head *head_ptr, size_t *len_ptr)
> +__NR_get_robust_list	312		sys_get_robust_list	(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
>  __NR_vmsplice		316		sys_vmsplice		(int fd, const struct iovec *iov, unsigned int nr_segs, unsigned int flags)
>  __NR_signalfd		321		sys_signalfd		(int ufd, const k_rtsigset_t *sigmask, size_t sigsetsize)
>  __NR_timerfd_settime	325		sys_timerfd_settime	(int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr)
>