netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Slaby <jirislaby@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Eric Paris <eparis@redhat.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, Neil Horman <nhorman@tuxdriver.com>
Subject: Re: linux-next: manual merge of the limits tree with the net and fsnotify trees
Date: Fri, 04 Dec 2009 08:59:22 +0100	[thread overview]
Message-ID: <4B18C15A.8060901@gmail.com> (raw)
In-Reply-To: <20091204183011.e92d36cd.sfr@canb.auug.org.au>

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

  reply	other threads:[~2009-12-04  7:59 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-04  7:30 linux-next: manual merge of the limits tree with the net and fsnotify trees Stephen Rothwell
2009-12-04  7:59 ` Jiri Slaby [this message]
2009-12-05  4:00   ` Stephen Rothwell
2009-12-05 14:21     ` Jiri Slaby

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B18C15A.8060901@gmail.com \
    --to=jirislaby@gmail.com \
    --cc=acme@redhat.com \
    --cc=davem@davemloft.net \
    --cc=eparis@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@tuxdriver.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).