Subject: Re: linux-next: manual merge of the limits tree with the net and fsnotify trees

From: Jiri Slaby <[email-masked]>
Date: Fri, 04 Dec 2009 08:59:22 +0100

On 12/04/2009 08:30 AM, Stephen Rothwell wrote:
> diff --cc arch/x86/ia32/ia32entry.S
> index da89ae1,c61ced2..0000000
> --- a/arch/x86/ia32/ia32entry.S
> +++ b/arch/x86/ia32/ia32entry.S
> @@@ -841,7 -841,6 +841,9 @@@ ia32_sys_call_table
>   	.quad compat_sys_pwritev
>   	.quad compat_sys_rt_tgsigqueueinfo	/* 335 */
>   	.quad sys_perf_event_open
>  +	.quad compat_sys_recvmmsg
>  +	.quad sys_fanotify_init
>  +	.quad sys32_fanotify_mark
> + 	.quad compat_sys_getprlimit

Thanks, but please go on with the by-five numbering in comments.

> + 	.quad compat_sys_setprlimit
>   ia32_syscall_end:
...
> diff --cc arch/x86/kernel/syscall_table_32.S
> index ca486c7,2dd45cd..0000000
> --- a/arch/x86/kernel/syscall_table_32.S
> +++ b/arch/x86/kernel/syscall_table_32.S
> @@@ -336,6 -336,5 +336,8 @@@ ENTRY(sys_call_table
>   	.long sys_pwritev
>   	.long sys_rt_tgsigqueueinfo	/* 335 */
>   	.long sys_perf_event_open
>  +	.long sys_recvmmsg
>  +	.long sys_fanotify_init
>  +	.long sys_fanotify_mark
> + 	.long sys_getprlimit

And here too.

> + 	.long sys_setprlimit

-- 
js